Skip to content

Add backendNodeId property to the ChildNodeInserted callback #1052

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
May 11, 2018
Merged

Add backendNodeId property to the ChildNodeInserted callback #1052

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
253a0b2
Add backendNodeId property in the ChildNodeInserted callback
darind May 10, 2018
0f93a17
Merge branch 'master' into darind/inspector-fix
vtrifonov May 11, 2018
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
6 changes: 5 additions & 1 deletion test-app/runtime/src/main/cpp/DOMDomainCallbackHandlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ void DOMDomainCallbackHandlers::ChildNodeInsertedCallback(const v8::FunctionCall
auto lastId = args[1]->ToNumber(isolate);
auto node = args[2]->ToString(isolate);

auto nodeJson = protocol::StringUtil::parseJSON(v8_inspector::toProtocolString(node));
auto resultString = V8DOMAgentImpl::AddBackendNodeIdProperty(isolate, node);
auto resultUtf16Data = resultString.data();

auto nodeJson = protocol::StringUtil::parseJSON(String16((const uint16_t*) resultUtf16Data));

protocol::ErrorSupport errorSupport;
auto domNode = protocol::DOM::Node::fromValue(nodeJson.get(), &errorSupport);
Expand All @@ -48,6 +51,7 @@ void DOMDomainCallbackHandlers::ChildNodeInsertedCallback(const v8::FunctionCall
if (!errorSupportString.empty()) {
auto errorMessage = "Error while parsing debug `DOM Node` object. ";
DEBUG_WRITE_FORCE("%s Error: %s", errorMessage, errorSupportString.c_str());
return;
}

domAgentInstance->m_frontend.childNodeInserted(parentId->Int32Value(), lastId->Int32Value(), std::move(domNode));
Expand Down
78 changes: 42 additions & 36 deletions test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-dom-agent-impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,42 +95,7 @@ DispatchResponse V8DOMAgentImpl::getDocument(Maybe<int> in_depth, Maybe<bool> in

if (!outResult->ToObject()->Has(context, ArgConverter::ConvertToV8String(isolate, "backendNodeId")).FromMaybe(false)) {
// Using an older version of the modules which doesn't set the backendNodeId required property
auto scriptSource =
"(function () {"
" function addBackendNodeId(node) {"
" if (!node.backendNodeId) {"
" node.backendNodeId = 0;"
" }"
" if (node.children) {"
" for (var i = 0; i < node.children.length; i++) {"
" addBackendNodeId(node.children[i]);"
" }"
" }"
" }"
" return function(stringifiedNode) {"
" try {"
" const node = JSON.parse(stringifiedNode);"
" addBackendNodeId(node);"
" return JSON.stringify(node);"
" } catch (e) {"
" return stringifiedNode;"
" }"
" }"
"})()";

auto source = ArgConverter::ConvertToV8String(isolate, scriptSource);
v8::Local<v8::Script> script;
v8::Script::Compile(context, source).ToLocal(&script);

v8::Local<v8::Value> result;
script->Run(context).ToLocal(&result);
auto addBackendNodeIdFunction = result.As<v8::Function>();

v8::Local<v8::Value> args[] = { outResult };
v8::Local<v8::Value> scriptResult;
addBackendNodeIdFunction->Call(context, context->Global(), 1, args).ToLocal(&scriptResult);

resultString = ArgConverter::ConvertToUtf16String(scriptResult->ToString());
resultString = AddBackendNodeIdProperty(isolate, outResult);
}

auto resultUtf16Data = resultString.data();
Expand Down Expand Up @@ -363,5 +328,46 @@ DispatchResponse V8DOMAgentImpl::getFrameOwner(const String& in_frameId, int* ou
return utils::Common::protocolCommandNotSupportedDispatchResponse();
}

std::u16string V8DOMAgentImpl::AddBackendNodeIdProperty(v8::Isolate* isolate, v8::Local<v8::Value> jsonInput) {
auto scriptSource =
"(function () {"
" function addBackendNodeId(node) {"
" if (!node.backendNodeId) {"
" node.backendNodeId = 0;"
" }"
" if (node.children) {"
" for (var i = 0; i < node.children.length; i++) {"
" addBackendNodeId(node.children[i]);"
" }"
" }"
" }"
" return function(stringifiedNode) {"
" try {"
" const node = JSON.parse(stringifiedNode);"
" addBackendNodeId(node);"
" return JSON.stringify(node);"
" } catch (e) {"
" return stringifiedNode;"
" }"
" }"
"})()";

auto source = ArgConverter::ConvertToV8String(isolate, scriptSource);
v8::Local<v8::Script> script;
auto context = isolate->GetCurrentContext();
v8::Script::Compile(context, source).ToLocal(&script);

v8::Local<v8::Value> result;
script->Run(context).ToLocal(&result);
auto addBackendNodeIdFunction = result.As<v8::Function>();

v8::Local<v8::Value> funcArguments[] = { jsonInput };
v8::Local<v8::Value> scriptResult;
addBackendNodeIdFunction->Call(context, context->Global(), 1, funcArguments).ToLocal(&scriptResult);

auto resultString = ArgConverter::ConvertToUtf16String(scriptResult->ToString());
return resultString;
}

V8DOMAgentImpl* V8DOMAgentImpl::Instance = 0;
}
1 change: 1 addition & 0 deletions test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-dom-agent-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class V8DOMAgentImpl : public protocol::DOM::Backend {
static V8DOMAgentImpl* Instance;
protocol::DOM::Frontend m_frontend;

static std::u16string AddBackendNodeIdProperty(v8::Isolate* isolate, v8::Local<v8::Value> jsonInput);
private:
V8InspectorSessionImpl* m_session;
protocol::DictionaryValue* m_state;
Expand Down