[DevTools] Eliminate frameId and isContentScript from js protocol.

third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

 /*
  * Copyright (c) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 43 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorTaskRunner.h"
 #include "core/timing/MemoryInfo.h"
 #include "core/workers/MainThreadWorkletGlobalScope.h"
 #include "core/xml/XPathEvaluator.h"
 #include "core/xml/XPathResult.h"
 #include "platform/UserGestureIndicator.h"
+#include "platform/inspector_protocol/Values.h"
 #include "platform/v8_inspector/public/V8Inspector.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/ThreadingPrimitives.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
 int frameId(LocalFrame* frame)
@@ skipping 64 matching lines @@
     DCHECK(isMainThread());
     if (frame->localFrameRoot() == frame)
         v8Inspector()->resetContextGroup(contextGroupId(frame));
 }
 
 void MainThreadDebugger::contextCreated(ScriptState* scriptState, LocalFrame* frame, SecurityOrigin* origin)
 {
     ASSERT(isMainThread());
     v8::HandleScope handles(scriptState->isolate());
     DOMWrapperWorld& world = scriptState->world();
-    v8Inspector()->contextCreated(V8ContextInfo(scriptState->context(), contextGroupId(frame), world.isMainWorld(), origin ? origin->toRawString() : "", world.isIsolatedWorld() ? world.isolatedWorldHumanReadableName() : "", IdentifiersFactory::frameId(frame), scriptState->getExecutionContext()->isDocument()));
+    std::unique_ptr<protocol::DictionaryValue> auxData = protocol::DictionaryValue::create();
+    auxData->setBoolean("isDefault", world.isMainWorld());
+    auxData->setString("frameId", IdentifiersFactory::frameId(frame));
+    V8ContextInfo contextInfo(scriptState->context(), contextGroupId(frame), world.isIsolatedWorld() ? world.isolatedWorldHumanReadableName() : "");
+    if (origin)
+        contextInfo.origin = origin->toRawString();
+    contextInfo.auxData = auxData->toJSONString();
+    contextInfo.hasMemoryOnConsole = scriptState->getExecutionContext()->isDocument();
+    v8Inspector()->contextCreated(contextInfo);
 }
 
 void MainThreadDebugger::contextWillBeDestroyed(ScriptState* scriptState)
 {
     v8::HandleScope handles(scriptState->isolate());
     v8Inspector()->contextDestroyed(scriptState->context());
 }
 
 void MainThreadDebugger::exceptionThrown(ExecutionContext* context, ErrorEvent* event)
 {
@@ skipping 231 matching lines @@
                 return;
             if (!nodes->Set(context, index++, toV8(node, info.Holder(), info.GetIsolate())).FromMaybe(false))
                 return;
         }
         info.GetReturnValue().Set(nodes);
     }
     exceptionState.throwIfNeeded();
 }
 
 } // namespace blink