Parametrize PageScriptDebugServer with v8::Context -> InspectorHost resolver

sky/engine/v8_inspector/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 143 matching lines @@
 void PageScriptDebugServer::interruptAndRun(PassOwnPtr<Task> task)
 {
     ScriptDebugServer::interruptAndRun(task, s_mainThreadIsolate);
 }
 
 void PageScriptDebugServer::setClientMessageLoop(PassOwnPtr<ClientMessageLoop> clientMessageLoop)
 {
     m_clientMessageLoop = clientMessageLoop;
 }
 
+void PageScriptDebugServer::setInspectorHostResolver(PassOwnPtr<InspectorHostResolver> resolver)
+{
+    m_inspectorHostResolver = resolver;
+}
+
 void PageScriptDebugServer::compileScript(ScriptState* scriptState, const String& expression, const String& sourceURL, String* scriptId, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtr<ScriptCallStack>* stackTrace)
 {
     ExecutionContext* executionContext = scriptState->executionContext();
     RefPtr<LocalFrame> protect = executionContext->executingWindow()->frame();
     ScriptDebugServer::compileScript(scriptState, expression, sourceURL, scriptId, exceptionDetailsText, lineNumber, columnNumber, stackTrace);
     if (!scriptId->isNull())
         m_compiledScriptURLs.set(*scriptId, sourceURL);
 }
 
 void PageScriptDebugServer::clearCompiledScripts()
@@ skipping 12 matching lines @@
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
 
     RefPtr<LocalFrame> protect = frame;
     ScriptDebugServer::runScript(scriptState, scriptId, result, wasThrown, exceptionDetailsText, lineNumber, columnNumber, stackTrace);
 
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data());
 }
 
 ScriptDebugListener* PageScriptDebugServer::getDebugListenerForContext(v8::Handle<v8::Context> context)
 {
-    v8::HandleScope scope(m_isolate);
-    LocalFrame* frame = retrieveFrameWithGlobalObjectCheck(context);
-    if (!frame)
+    inspector::InspectorHost* inspectorHost = m_inspectorHostResolver->inspectorHostFor(context);
+    if (!inspectorHost)
         return 0;
-    return m_listenersMap.get(frame->page()->inspectorHost());
+    return m_listenersMap.get(inspectorHost);
 }
 
 void PageScriptDebugServer::runMessageLoopOnPause(v8::Handle<v8::Context> context)
 {
-    v8::HandleScope scope(m_isolate);
-    LocalFrame* frame = retrieveFrameWithGlobalObjectCheck(context);
-    m_pausedHost = frame->page()->inspectorHost();
+    m_pausedHost = m_inspectorHostResolver->inspectorHostFor(context);
+    ASSERT(m_pausedHost);
 
     // Wait for continue or step command.
     m_clientMessageLoop->run(m_pausedHost);
 
     // The listener may have been removed in the nested loop.
     if (ScriptDebugListener* listener = m_listenersMap.get(m_pausedHost))
         listener->didContinue();
 
     m_pausedHost = 0;
 }
@@ skipping 88 matching lines @@
     UseCounter::muteForInspector();
 }
 
 void PageScriptDebugServer::unmuteWarningsAndDeprecations()
 {
     FrameConsole::unmute();
     UseCounter::unmuteForInspector();
 }
 
 } // namespace blink