Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1308)

Unified Diff: third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp

Issue 2215153002: [DevTools] Eliminate frameId and isContentScript from js protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: navigation tracker Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
index 7c030806ee32509053e421a6effa09af4250e378..cf2c2ba82e78c37f908e18bc1283ad9a97fd7e2d 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp
@@ -30,6 +30,7 @@
#include "platform/v8_inspector/V8RuntimeAgentImpl.h"
+#include "platform/inspector_protocol/Parser.h"
#include "platform/inspector_protocol/Values.h"
#include "platform/v8_inspector/InjectedScript.h"
#include "platform/v8_inspector/InspectedContext.h"
@@ -649,10 +650,10 @@ void V8RuntimeAgentImpl::reportExecutionContextCreated(InspectedContext* context
context->setReported(true);
std::unique_ptr<protocol::Runtime::ExecutionContextDescription> description = protocol::Runtime::ExecutionContextDescription::create()
.setId(context->contextId())
- .setIsDefault(context->isDefault())
.setName(context->humanReadableName())
- .setOrigin(context->origin())
- .setFrameId(context->frameId()).build();
+ .setOrigin(context->origin()).build();
+ if (!context->auxData().isEmpty())
+ description->setAuxData(protocol::DictionaryValue::cast(parseJSON(context->auxData())));
m_frontend.executionContextCreated(std::move(description));
}

Powered by Google App Engine
This is Rietveld 408576698