Skip to content

Commit e935a61

Browse files
committed
fix(chrome-devtools): Elements tab
This partially reverts the fix from #1641 as it ends up never calling `m_backend->getDocument`. This may bring back an issue from #1640 - though was unable to reproduce with latest everything.
1 parent 528c46f commit e935a61

File tree

1 file changed

+18
-23
lines changed
  • test-app/runtime/src/main/cpp/v8_inspector/src/inspector/protocol

1 file changed

+18
-23
lines changed

test-app/runtime/src/main/cpp/v8_inspector/src/inspector/protocol/DOM.cpp

+18-23
Original file line numberDiff line numberDiff line change
@@ -1932,42 +1932,37 @@ void DomainDispatcherImpl::getDocument(const v8_crdtp::Dispatchable& dispatchabl
19321932
errors->SetName("depth");
19331933
in_depth = ValueConversions<int>::fromValue(depthValue, errors);
19341934
}
1935-
19361935
protocol::Value* pierceValue = params ? params->get("pierce") : nullptr;
19371936
Maybe<bool> in_pierce;
19381937
if (pierceValue) {
19391938
errors->SetName("pierce");
19401939
in_pierce = ValueConversions<bool>::fromValue(pierceValue, errors);
19411940
}
1942-
19431941
if (MaybeReportInvalidParams(dispatchable, *errors)) return;
19441942
// Declare output parameters.
19451943
std::unique_ptr<protocol::DOM::Node> out_root;
19461944

19471945
std::unique_ptr<DomainDispatcher::WeakPtr> weak = weakPtr();
19481946

1949-
if (depthValue && pierceValue) {
1950-
//NOTE: in_depth & in_pierce are not used in the method getDocument, see in v8-dom-agent-impl.cpp:63
1951-
DispatchResponse response = m_backend->getDocument(std::move(in_depth),
1952-
std::move(in_pierce), &out_root);
1953-
if (response.IsFallThrough()) {
1954-
channel()->FallThrough(dispatchable.CallId(), v8_crdtp::SpanFrom("DOM.getDocument"),
1955-
dispatchable.Serialized());
1956-
return;
1957-
}
1958-
if (weak->get()) {
1959-
std::vector<uint8_t> result;
1960-
if (response.IsSuccess()) {
1961-
v8_crdtp::cbor::EnvelopeEncoder envelope_encoder;
1962-
envelope_encoder.EncodeStart(&result);
1963-
result.push_back(v8_crdtp::cbor::EncodeIndefiniteLengthMapStart());
1964-
v8_crdtp::SerializeField(v8_crdtp::SpanFrom("root"), out_root, &result);
1965-
result.push_back(v8_crdtp::cbor::EncodeStop());
1966-
envelope_encoder.EncodeStop(&result);
1967-
}
1968-
weak->get()->sendResponse(dispatchable.CallId(), response,
1969-
v8_crdtp::Serializable::From(std::move(result)));
1947+
DispatchResponse response = m_backend->getDocument(std::move(in_depth),
1948+
std::move(in_pierce), &out_root);
1949+
if (response.IsFallThrough()) {
1950+
channel()->FallThrough(dispatchable.CallId(), v8_crdtp::SpanFrom("DOM.getDocument"),
1951+
dispatchable.Serialized());
1952+
return;
1953+
}
1954+
if (weak->get()) {
1955+
std::vector<uint8_t> result;
1956+
if (response.IsSuccess()) {
1957+
v8_crdtp::cbor::EnvelopeEncoder envelope_encoder;
1958+
envelope_encoder.EncodeStart(&result);
1959+
result.push_back(v8_crdtp::cbor::EncodeIndefiniteLengthMapStart());
1960+
v8_crdtp::SerializeField(v8_crdtp::SpanFrom("root"), out_root, &result);
1961+
result.push_back(v8_crdtp::cbor::EncodeStop());
1962+
envelope_encoder.EncodeStop(&result);
19701963
}
1964+
weak->get()->sendResponse(dispatchable.CallId(), response,
1965+
v8_crdtp::Serializable::From(std::move(result)));
19711966
}
19721967
return;
19731968
}

0 commit comments

Comments
 (0)