Skip to content

Bug/debugger in line #1641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2020
Merged

Bug/debugger in line #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be0285f
In line debugger - can't connect through websocket
dev4s Oct 12, 2020
8e1bd28
Removed some comments
dev4s Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions test-app/runtime/src/main/cpp/JsV8InspectorClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ void JsV8InspectorClient::connect(jobject connection) {
}

void JsV8InspectorClient::scheduleBreak() {
v8::Locker locker(isolate_);
Isolate::Scope isolate_scope(isolate_);
v8::HandleScope handleScope(isolate_);
auto context = Runtime::GetRuntime(isolate_)->GetContext();
Context::Scope context_scope(context);

this->session_->schedulePauseOnNextStatement(v8_inspector::StringView(), v8_inspector::StringView());
}
Expand Down
41 changes: 25 additions & 16 deletions test-app/runtime/src/main/cpp/v8_inspector/src/inspector/protocol/DOM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,34 +1932,43 @@ void DomainDispatcherImpl::getDocument(const v8_crdtp::Dispatchable& dispatchabl
errors->SetName("depth");
in_depth = ValueConversions<int>::fromValue(depthValue, errors);
}

protocol::Value* pierceValue = params ? params->get("pierce") : nullptr;
Maybe<bool> in_pierce;
if (pierceValue) {
errors->SetName("pierce");
in_pierce = ValueConversions<bool>::fromValue(pierceValue, errors);
}

if (MaybeReportInvalidParams(dispatchable, *errors)) return;
// Declare output parameters.
std::unique_ptr<protocol::DOM::Node> out_root;

std::unique_ptr<DomainDispatcher::WeakPtr> weak = weakPtr();
DispatchResponse response = m_backend->getDocument(std::move(in_depth), std::move(in_pierce), &out_root);
if (response.IsFallThrough()) {
channel()->FallThrough(dispatchable.CallId(), v8_crdtp::SpanFrom("DOM.getDocument"), dispatchable.Serialized());
return;
}
if (weak->get()) {
std::vector<uint8_t> result;
if (response.IsSuccess()) {
v8_crdtp::cbor::EnvelopeEncoder envelope_encoder;
envelope_encoder.EncodeStart(&result);
result.push_back(v8_crdtp::cbor::EncodeIndefiniteLengthMapStart());
v8_crdtp::SerializeField(v8_crdtp::SpanFrom("root"), out_root, &result);
result.push_back(v8_crdtp::cbor::EncodeStop());
envelope_encoder.EncodeStop(&result);

if (depthValue && pierceValue) {
//NOTE: in_depth & in_pierce are not used in the method getDocument, see in v8-dom-agent-impl.cpp:63
DispatchResponse response = m_backend->getDocument(std::move(in_depth),
std::move(in_pierce), &out_root);
if (response.IsFallThrough()) {
channel()->FallThrough(dispatchable.CallId(), v8_crdtp::SpanFrom("DOM.getDocument"),
dispatchable.Serialized());
return;
}
weak->get()->sendResponse(dispatchable.CallId(), response, v8_crdtp::Serializable::From(std::move(result)));
}
if (weak->get()) {
std::vector<uint8_t> result;
if (response.IsSuccess()) {
v8_crdtp::cbor::EnvelopeEncoder envelope_encoder;
envelope_encoder.EncodeStart(&result);
result.push_back(v8_crdtp::cbor::EncodeIndefiniteLengthMapStart());
v8_crdtp::SerializeField(v8_crdtp::SpanFrom("root"), out_root, &result);
result.push_back(v8_crdtp::cbor::EncodeStop());
envelope_encoder.EncodeStop(&result);
}
weak->get()->sendResponse(dispatchable.CallId(), response,
v8_crdtp::Serializable::From(std::move(result)));
}
}
return;
}

Expand Down