Refactor service usage in Dartium

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 226 matching lines @@
         // so weak handles strong, see the corresponding logic in
         // DartGCController.
         domData->setReachableWeakHandle(Dart_NewWeakPersistentHandle(localHandle, 0, 0));
 
         DartDebugServer::shared().registerIsolate(isolate);
     }
 
     return isolate;
 }
 
-
 void DartController::createDOMEnabledIsolateIfNeeded(const String& scriptURL, const String& entryPoint, Document* document)
 {
     if (m_isolate) {
         Dart_EnterIsolate(m_isolate);
         return;
     }
 
+    // Start the service.
+    bool result = DartService::Start(document);
+    UNUSED_PARAM(result);
+    ASSERT(result);
+    ASSERT(!Dart_CurrentIsolate());
+
     // FIXME: proper error reporting.
     char* errorMessage = 0;
     m_isolate = createIsolate(scriptURL.utf8().data(), entryPoint.utf8().data(), document, true, &errorMessage);
     ASSERT(m_isolate);
-    if (getenv("DARTIUM_VMSERVICE")) {
-        // createIsolate exits with current isolate set to m_isolate, we need to
-        // exit it so we can startup the service.
-        Dart_ExitIsolate();
-
-        bool result = DartService::Start(document);
-        UNUSED_PARAM(result);
-        ASSERT(result);
-        ASSERT(!Dart_CurrentIsolate());
-
-        Dart_EnterIsolate(m_isolate);
-        Dart_EnterScope();
-        DartService::SendIsolateStartupMessage();
-        Dart_ExitScope();
-    }
-
 }
 
 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);
     DartIsolateDestructionObservers* observers = domData->isolateDestructionObservers();
     for (DartIsolateDestructionObservers::iterator it = observers->begin(); it != observers->end(); ++it)
         (*it)->isolateDestroyed();
     Dart_ShutdownIsolate();
-    // Stop the service.
-    DartService::Stop();
     delete domData;
 }
 
 DartController::DartController(Frame* frame)
     : m_frame(frame)
     , m_isolate(0)
     , m_asyncLoader(0)
     , m_npObjectMap()
 {
     // The DartController's constructor must be called in the Frame's
@@ skipping 102 matching lines @@
 
         applicationLoader->load(asyncLoader);
         Dart_IsolateMakeRunnable(m_isolate);
     }
 
 private:
     Dart_Isolate m_isolate;
     String m_url;
 };
 
+
+Dart_Isolate DartController::createServiceIsolateCallback(void* callbackData, char** error)
+{
+    Document* document = static_cast<Document*>(callbackData);
+    Dart_Isolate serviceIsolate = DartController::createIsolate("dart:vmservice_dartium", "main", document, true, error);
+    Dart_ExitIsolate();
+    return serviceIsolate;
+}
+
+
 Dart_Isolate DartController::createPureIsolateCallback(const char* scriptURL, const char* entryPoint, void* data, char** errorMsg)
 {
     bool isSpawnUri = scriptURL ? true : false;
 
     if (!isSpawnUri) {
         // Determine the parent Isolate's URL as we will be using the same for creating
         // the isolate being spawned using spawnFunction.
         DartApiScope apiScope;
         Dart_Handle parentIsolateRootLibrary = Dart_RootLibrary();
         if (Dart_IsError(parentIsolateRootLibrary)) {
@@ skipping 21 matching lines @@
         // spawnFunction is not allowed from a DOM enabled isolate.
         // This triggers an exception in the caller.
         *errorMsg = strdup("spawnFunction is not supported from a dom-enabled isolate. Please use spawnUri instead.");
         return 0;
     }
 
     ASSERT(context->isDocument());
     Document* document = static_cast<Document*>(context);
 
     Dart_Isolate isolate = createIsolate(scriptURL, entryPoint, document, false, errorMsg);
-    {
-        Dart_EnterScope();
-        DartService::SendIsolateStartupMessage();
-        Dart_ExitScope();
-    }
 
     if (!isolate) {
         // This triggers an exception in the caller.
         *errorMsg = strdup("Isolate spawn failed.");
         return 0;
     }
 
     // FIXME: If a spawnFunction, we should not need to request resources again. But, it's not clear
     // we need this callback in the first place for spawnFunction.
 
@@ skipping 126 matching lines @@
 
     char flagsProp[DartUtilities::PROP_VALUE_MAX_LEN];
     int propLen = DartUtilities::getProp(
         "DART_FLAGS", flagsProp, DartUtilities::PROP_VALUE_MAX_LEN);
     if (propLen > 0) {
         setDartFlags(flagsProp);
     } else {
         setDartFlags(0);
     }
 
-    // FIXME(antonm): implement proper shutdown callback.
     // FIXME(antonm): implement proper unhandled exception callback.
-    Dart_Initialize(&createPureIsolateCallback, 0, 0, DartService::VmServiceShutdownCallback, openFileCallback, readFileCallback, writeFileCallback, closeFileCallback, generateEntropy);
+    Dart_Initialize(&createPureIsolateCallback, 0, 0, 0, openFileCallback, readFileCallback, writeFileCallback, closeFileCallback, generateEntropy, createServiceIsolateCallback);
     hasBeenInitialized = true;
 }
 
 static bool checkForExpiration()
 {
     const time_t ExpirationTimeSecsSinceEpoch =
 #include "bindings/dart/ExpirationTimeSecsSinceEpoch.time_t"
     ;
     const char* override = getenv("DARTIUM_EXPIRATION_TIME");
     time_t expiration;
@@ skipping 264 matching lines @@
         Dart_Handle libraryIdHandle = Dart_ListGetAt(libraryIdList, i);
         Dart_Handle exception = 0;
         intptr_t libraryId = DartUtilities::toInteger(libraryIdHandle, exception);
         ASSERT(!exception);
         DartScriptState* scriptState = lookupScriptStateFromLibraryIdMap(isolate, v8Context, libraryIdMap, libraryId);
         result.append(scriptState);
     }
 }
 
 }