Fix for bug 16534 do not Enter the same isolate on two different threads.

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 340 matching lines @@
         if (Dart_IsError(result))
             DartUtilities::reportProblem(context, result);
     }
 
 private:
     RefPtr<ThreadSafeDartIsolateWrapper> m_destinationIsolate;
 };
 
 static void messageNotifyCallback(Dart_Isolate destinationIsolate)
 {
-    DartIsolateScope scope(destinationIsolate);
-    DartDOMData* domData = DartDOMData::current();
+    DartDOMData* domData = static_cast<DartDOMData*>(Dart_IsolateData(destinationIsolate));
     ASSERT(domData->isDOMEnabled());
     ExecutionContext* destinationContext = domData->scriptExecutionContext();
     destinationContext->postTask(adoptPtr(new MessageNotifyTask(domData->threadSafeIsolateWrapper())));
 }
 
 class SpawnUriErrorEventDispatcher : public DartErrorEventDispatcher {
 public:
     // TODO(antonm): this is used to dispatch DOM error event. Most probably we need
     // nothing like that for spawnDomUri, but need to double check.
     void dispatchErrorEvent() { }
@@ skipping 101 matching lines @@
 }
 
 static char* skipBlackSpace(char* p)
 {
     for (; *p != '\0' && !isspace(*p); p++) { }
     return p;
 }
 
 static void setDartFlags(const char* str)
 {
-    const char* disableProfiler = "--no-profile";
-
     if (!str) {
-        Dart_SetVMFlags(1, &disableProfiler);
+        Dart_SetVMFlags(0, 0);
         return;
     }
 
     size_t length = strlen(str);
     char* copy = new char[length + 1];
     memmove(copy, str, length);
     copy[length] = '\0';
 
     // Strip leading white space.
     char* start = skipWhiteSpace(copy);
 
     // Count the number of 'arguments'.
     int argc = 0;
     for (char* p = start; *p != '\0'; argc++) {
         p = skipBlackSpace(p);
         p = skipWhiteSpace(p);
     }
 
     // Allocate argument array.
-    const char** argv = new const char*[argc + 1];
+    const char** argv = new const char*[argc];
 
     // Split the flags string into arguments.
     argc = 0;
     for (char* p = start; *p != '\0'; argc++) {
         argv[argc] = p;
         p = skipBlackSpace(p);
         if (*p != '\0')
             *p++ = '\0'; // 0-terminate argument
         p = skipWhiteSpace(p);
     }
-    argv[argc] = disableProfiler;
 
     // Set the flags.
-    Dart_SetVMFlags(argc + 1, argv);
+    Dart_SetVMFlags(argc, argv);
 
     delete[] argv;
     delete[] copy;
 }
 
 namespace {
 
 #if OS(LINUX)
 
 static void* openFileCallback(const char* name, bool write)
@@ skipping 344 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);
     }
 }
 
 }