DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones.

Source/bindings/core/v8/PageScriptDebugServer.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 81 matching lines @@
 
 v8::Isolate* PageScriptDebugServer::s_mainThreadIsolate = 0;
 
 void PageScriptDebugServer::setMainThreadIsolate(v8::Isolate* isolate)
 {
     s_mainThreadIsolate = isolate;
 }
 
 PageScriptDebugServer::PageScriptDebugServer()
     : ScriptDebugServer(s_mainThreadIsolate)
-    , m_pausedPage(nullptr)
+    , m_pausedFrame(nullptr)
     , m_preprocessorSourceCode()
 {
 }
 
 PageScriptDebugServer::~PageScriptDebugServer()
 {
 }
 
 void PageScriptDebugServer::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_listenersMap);
-    visitor->trace(m_pausedPage);
+    visitor->trace(m_pausedFrame);
     visitor->trace(m_preprocessorSourceCode);
 #endif
     ScriptDebugServer::trace(visitor);
 }
 
-void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
+void PageScriptDebugServer::addListener(ScriptDebugListener* listener, LocalFrame* localFrame)

[yurys, 2015/02/03 06:44:00]

It'd be less ambiguous it were called localFrameRoot rather that plain
localFrame. WDYT? It would also make sense to add (frame ==
frame->localFrameRoot()) assertions in some of the places being changed.

[pfeldman, 2015/02/03 07:09:16]

Done.

 {
-    ScriptController& scriptController = page->deprecatedLocalMainFrame()->script();
+    ScriptController& scriptController = localFrame->script();
     if (!scriptController.canExecuteScripts(NotAboutToExecuteScript))
         return;
 
     v8::HandleScope scope(m_isolate);
 
     if (!m_listenersMap.size()) {
         v8::Debug::SetDebugEventListener(&PageScriptDebugServer::v8DebugEventCallback, v8::External::New(m_isolate, this));
         ensureDebuggerScriptCompiled();
     }
 
     v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
     v8::Context::Scope contextScope(debuggerContext);
 
     v8::Local<v8::Object> debuggerScript = m_debuggerScript.newLocal(m_isolate);
     ASSERT(!debuggerScript->IsUndefined());
-    m_listenersMap.set(page, listener);
+    m_listenersMap.set(localFrame, listener);
 
     WindowProxy* windowProxy = scriptController.existingWindowProxy(DOMWrapperWorld::mainWorld());
     if (!windowProxy || !windowProxy->isContextInitialized())
         return;
     v8::Local<v8::Context> context = windowProxy->context();
     v8::Handle<v8::Function> getScriptsFunction = v8::Local<v8::Function>::Cast(debuggerScript->Get(v8AtomicString(m_isolate, "getScripts")));
     v8::Handle<v8::Value> argv[] = { V8PerContextDebugData::contextDebugData(context) };
     v8::Handle<v8::Value> value = V8ScriptRunner::callInternalFunction(getScriptsFunction, debuggerScript, WTF_ARRAY_LENGTH(argv), argv, m_isolate);
     if (value.IsEmpty())
         return;
     ASSERT(!value->IsUndefined() && value->IsArray());
     v8::Handle<v8::Array> scriptsArray = v8::Handle<v8::Array>::Cast(value);
     for (unsigned i = 0; i < scriptsArray->Length(); ++i)
         dispatchDidParseSource(listener, v8::Handle<v8::Object>::Cast(scriptsArray->Get(v8::Integer::New(m_isolate, i))), CompileSuccess);
 }
 
-void PageScriptDebugServer::removeListener(ScriptDebugListener* listener, Page* page)
+void PageScriptDebugServer::removeListener(ScriptDebugListener* listener, LocalFrame* localFrame)
 {
-    if (!m_listenersMap.contains(page))
+    if (!m_listenersMap.contains(localFrame))
         return;
 
-    if (m_pausedPage == page)
+    if (m_pausedFrame == localFrame)
         continueProgram();
 
-    m_listenersMap.remove(page);
+    m_listenersMap.remove(localFrame);
 
     if (m_listenersMap.isEmpty()) {
         discardDebuggerScript();
         v8::Debug::SetDebugEventListener(0);
         // FIXME: Remove all breakpoints set by the agent.
     }
 }
 
 void PageScriptDebugServer::interruptAndRun(PassOwnPtr<Task> task)
 {
@@ skipping 39 matching lines @@
         InspectorInstrumentation::didEvaluateScript(cookie);
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data());
 }
 
 ScriptDebugListener* PageScriptDebugServer::getDebugListenerForContext(v8::Handle<v8::Context> context)
 {
     v8::HandleScope scope(m_isolate);
     LocalFrame* frame = retrieveFrameWithGlobalObjectCheck(context);
     if (!frame)
         return 0;
-    return m_listenersMap.get(frame->page());
+    return m_listenersMap.get(frame->localFrameRoot());
 }
 
 void PageScriptDebugServer::runMessageLoopOnPause(v8::Handle<v8::Context> context)
 {
     v8::HandleScope scope(m_isolate);
     LocalFrame* frame = retrieveFrameWithGlobalObjectCheck(context);
-    m_pausedPage = frame->page();
+    m_pausedFrame = frame->localFrameRoot();
 
     // Wait for continue or step command.
-    m_clientMessageLoop->run(m_pausedPage);
+    m_clientMessageLoop->run(m_pausedFrame);
 
     // The listener may have been removed in the nested loop.
-    if (ScriptDebugListener* listener = m_listenersMap.get(m_pausedPage))
+    if (ScriptDebugListener* listener = m_listenersMap.get(m_pausedFrame))
         listener->didContinue();
 
-    m_pausedPage = 0;
+    m_pausedFrame = 0;
 }
 
 void PageScriptDebugServer::quitMessageLoopOnPause()
 {
     m_clientMessageLoop->quitNow();
 }
 
 void PageScriptDebugServer::preprocessBeforeCompile(const v8::Debug::EventDetails& eventDetails)
 {
     v8::Handle<v8::Context> eventContext = eventDetails.GetEventContext();
@@ skipping 79 matching lines @@
     UseCounter::muteForInspector();
 }
 
 void PageScriptDebugServer::unmuteWarningsAndDeprecations()
 {
     FrameConsole::unmute();
     UseCounter::unmuteForInspector();
 }
 
 } // namespace blink