Disable spawnFunction from dom enabled isolates

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 332 matching lines @@
         Dart_IsolateMakeRunnable(m_isolate);
     }
 
 private:
     Dart_Isolate m_isolate;
     String m_url;
 };
 
 Dart_Isolate DartController::createPureIsolateCallback(const char* scriptURL, const char* entryPoint, void* data, char** errorMsg)
 {
-    bool needAsyncLoader = false;
+    bool isSpawnUri = false;
 
     {
         DartApiScope apiScope;
-        // Hacky way to find out if it's spawnFunction or spawnUri.
+        // Hacky way to find out if it's spawnFunction or isSpawnUri.

[siva, 2013/10/08 23:46:32]

why does this comment have to change? spawnUri makes sense.

We should change the callback API to include a boolean (isSpawnUri).

This scheme of doing a string compare of the URIs won't work if somebody issues
a SpawnURI of the same URI because they want to load and execute a newer version
of the app in a new Isolate.

[vsm, 2013/10/09 04:48:35]

Fixed - bad search and replace.
Bug filed.
Good point.

         Dart_Handle parentIsolateRootLibrary = Dart_RootLibrary();
         if (Dart_IsError(parentIsolateRootLibrary)) {
             *errorMsg = strdup(Dart_GetError(parentIsolateRootLibrary));
             return 0;
         }
         Dart_Handle parentIsolateURLHandle = Dart_LibraryUrl(parentIsolateRootLibrary);
         if (Dart_IsError(parentIsolateURLHandle)) {
             *errorMsg = strdup(Dart_GetError(parentIsolateURLHandle));
             return 0;
         }
         const char * parentIsolateURL = 0;
         Dart_Handle result = Dart_StringToCString(parentIsolateURLHandle, &parentIsolateURL);
         if (Dart_IsError(result)) {
             *errorMsg = strdup(Dart_GetError(result));
             return 0;
         }
 
-        needAsyncLoader = strcmp(scriptURL, parentIsolateURL);
+        isSpawnUri = strcmp(scriptURL, parentIsolateURL);
     }
 
     DartDOMData* parentDOMData = static_cast<DartDOMData*>(data);
     ScriptExecutionContext* context = parentDOMData->scriptExecutionContext();
+
+    if (parentDOMData->isDOMEnabled() && !isSpawnUri) {
+        // spawnFunction is not allowed from a DOM enabled isolate
+        DartUtilities::reportProblem(context, "spawnFunction is not supported from a dom-enabled isolate.  Please use spawnUri instead.");
+    }
+
     ASSERT(context->isDocument());
     Document* document = static_cast<Document*>(context);
 
     Dart_Isolate isolate = createIsolate(scriptURL, entryPoint, document, false, errorMsg);
     if (!isolate)
         return 0;
 
-    if (needAsyncLoader) {
+    if (isSpawnUri) {
         // We need to request the sources asynchronously.
         RefPtr<DartSpawnLoadCallback> callback = adoptRef(new DartSpawnLoadCallback(isolate, scriptURL, document));
         // A DartAsyncLoader will delete itself once all resources are fetched.
         DartAsyncLoader* asyncLoader = new DartAsyncLoader(scriptURL, callback);
         asyncLoader->fetchScriptResource(scriptURL);
     } else {
         // FIXME: avoid copying parent snapshot.
         ASSERT(DartDOMData::current()->applicationSnapshot()->isEmpty());
         DartDOMData::current()->applicationSnapshot()->append(*parentDOMData->applicationSnapshot());
 
@@ skipping 494 matching lines @@
             scriptState = new DartScriptState(isolate, libraryId, v8Context);
             libraryIdMap->add(libraryId, scriptState);
         } else {
             scriptState = libraryIter->value;
         }
         result.append(scriptState);
     }
 }
 
 }