Merge DevTools Refactor CL to Blink36

Source/bindings/dart/DartController.cpp

 // Copyright (c) 2009, 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 26 matching lines @@
 
 #include "DartDocument.h"
 #include "DartService.h"
 #include "DartWindow.h"
 #include "HTMLNames.h"
 #include "bindings/common/ScheduledAction.h"
 #include "bindings/dart/DartApplicationLoader.h"
 #include "bindings/dart/DartAsyncLoader.h"
 #include "bindings/dart/DartDOMData.h"
 #include "bindings/dart/DartDOMWrapper.h"
-#include "bindings/dart/DartDebugServer.h"
 #include "bindings/dart/DartGCController.h"
 #include "bindings/dart/DartInspectorTimeline.h"
 #include "bindings/dart/DartIsolateDestructionObserver.h"
 #include "bindings/dart/DartJsInterop.h"
 #include "bindings/dart/DartNativeUtilities.h"
+#include "bindings/dart/DartScriptDebugServer.h"
 #include "bindings/dart/DartScriptState.h"
 #include "bindings/dart/DartUtilities.h"
 #include "bindings/dart/ThreadSafeDartIsolateWrapper.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/V8Binding.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/MutationObserver.h"
 #include "core/dom/NodeList.h"
@@ skipping 135 matching lines @@
         // this persistent handle explicitly because we will shutdown the isolate on
         // navigation.
         Dart_Handle localHandle = DartDocument::toDart(document);
         Dart_PersistentHandle ALLOW_UNUSED strongHandle = Dart_NewPersistentHandle(localHandle);
         // We need a weak handle to an always reachable object in order to temporarily make
         // weak handles strong during GC, see the corresponding logic in DartGCController.
         domData->setReachableWeakHandle(Dart_NewWeakPersistentHandle(localHandle, 0, 0, DartController::weakCallback));
         Dart_SetMessageNotifyCallback(&messageNotifyCallback);
         Dart_SetGcCallbacks(&DartGCController::prologueCallback, &DartGCController::epilogueCallback);
 
         if (isDebuggerEnabled) {

[vsm, 2014/06/03 14:24:49]

When is this enabled?  I seem to hit this path regardless of whether devtools is
open.

[Jacob, 2014/06/03 20:23:13]

I believe the flag is always true unless you start chrome with a flag to disable
it. As a separate CL we need to fix things so we don't register isolates until
the devtools / remote devtools connection is actually open. That said, the tax
for registering isolates will be much lower now that we don't need to parse a V8
script as part of the call to DartDebugServer/DartScriptDebugServer.

             DART_RECORD_TIMER("    createIsolate before debug setup");
-            DartDebugServer::shared().registerIsolate(isolate);
+            DartScriptDebugServer::shared().registerIsolate(isolate, document->page());
             DART_RECORD_TIMER("    createIsolate after debug setup");
         }
     }
     DART_RECORD_TIMER("    createIsolate done %.3f ms");
 
     return isolate;
 }
 
 Dart_Isolate DartController::createDOMEnabledIsolate(const String& scriptURL, const String& entryPoint, Document* document)
 {
     DART_START_TIMER();
     ASSERT(!Dart_CurrentIsolate());
 
     // FIXME: proper error reporting.
     char* errorMessage = 0;
     Dart_Isolate newIsolate = createIsolate(scriptURL.utf8().data(), entryPoint.utf8().data(), document, true, true, &errorMessage);
     ASSERT(newIsolate);
     m_isolates.append(newIsolate);
     DART_RECORD_TIMER("  createDOMEnabledIsolate took");
     return newIsolate;
 }
 
 void DartController::shutdownIsolate(Dart_Isolate isolate)
 {
     DartDOMData* domData = DartDOMData::current();
     ASSERT(domData->isDOMEnabled());
     // If the following assert triggers, we have hit dartbug.com/14183
     // FIXME: keep the isolate alive until the recursion level is 0.
     ASSERT(!*(domData->recursion()));
-    DartDebugServer::shared().unregisterIsolate(isolate);
+    DartScriptDebugServer::shared().unregisterIsolate(isolate, m_frame->page());
     DartIsolateDestructionObservers* observers = domData->isolateDestructionObservers();
     for (DartIsolateDestructionObservers::iterator it = observers->begin(); it != observers->end(); ++it)
         (*it)->isolateDestroyed();
     Dart_ShutdownIsolate();
     delete domData;
 }
 
 DartController::DartController(LocalFrame* frame)
     : m_frame(frame)
     , m_asyncLoader(0)
@@ skipping 668 matching lines @@
     DartAsyncLoader* asyncLoader = new DartAsyncLoader();
     asyncLoader->processSingleRequest(url, callback);
 
     // Restore caller isolate.
     Dart_EnterIsolate(caller);
 
     // FIXME: We need some way to return a Dart_Handle to the isolate we just created.
 }
 
 }