Revert "Revert "Support multiple DOM isolates and tweak devtools frontend to better handle large #s…

Source/bindings/core/dart/DartScriptState.h

 // Copyright 2013, 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 22 matching lines @@
 #include "bindings/core/v8/V8ScriptState.h"
 
 #include <dart_api.h>
 #include <v8.h>
 
 namespace blink {
 
 class DartScriptState : public ScriptState {
     WTF_MAKE_NONCOPYABLE(DartScriptState);
 public:
-    static PassRefPtr<DartScriptState> create(Dart_Isolate isolate, intptr_t libraryId, V8ScriptState* v8ScriptState)
+    static PassRefPtr<DartScriptState> create(Dart_Isolate isolate, intptr_t libraryId, V8ScriptState* v8ScriptState, const String& isolateName)
     {
-        return adoptRef(new DartScriptState(isolate, libraryId, v8ScriptState));
+        return adoptRef(new DartScriptState(isolate, libraryId, v8ScriptState, isolateName));
     }
 
     // Long term we want to be creating DartScriptStates without V8ScriptStates.
-    static PassRefPtr<DartScriptState> create(Dart_Isolate isolate, intptr_t libraryId)
+    static PassRefPtr<DartScriptState> create(Dart_Isolate isolate, intptr_t libraryId, const String& isolateName)
     {
-        return adoptRef(new DartScriptState(isolate, libraryId, 0));
+        return adoptRef(new DartScriptState(isolate, libraryId, 0, isolateName));
     }
 
     bool isDartScriptState() const { return true; }
     V8ScriptState* v8ScriptState()
     {
         ASSERT(m_v8ScriptState);
         return m_v8ScriptState.get();
     }
 
     LocalDOMWindow* domWindow() const { return m_v8ScriptState->domWindow(); }
@@ skipping 18 matching lines @@
     PassRefPtr<AbstractScriptPromise> createRejectedPromise(PassRefPtrWillBeRawPtr<DOMException>);
     PassRefPtr<AbstractScriptPromise> createPromiseRejectedWithTypeError(const String& message);
     virtual PassOwnPtr<AbstractScriptPromiseResolver> createPromiseResolver(ScriptPromiseResolver*);
     AbstractScriptStateProtectingContext* createProtectingContext();
     PassRefPtr<AbstractScriptValue> idbAnyToScriptValue(IDBAny*);
     PassRefPtr<AbstractScriptValue> idbKeyToScriptValue(IDBKey*);
 
     Dart_Isolate isolate() { return m_isolate; }
     virtual intptr_t libraryId() { return m_libraryId; }
 
-    virtual const String* name() { return &m_libraryUrl; }
+    virtual const String* name() { return &m_name; }
     virtual bool isJavaScript() { return false; }
 
 #ifndef NDEBUG
     void assertPrimaryKeyValidOrInjectable(PassRefPtr<SharedBuffer>, const Vector<blink::WebBlobInfo>*, IDBKey*, const IDBKeyPath&);
 #endif
 
 private:
-    explicit DartScriptState(Dart_Isolate, intptr_t libraryId, V8ScriptState*);
+    explicit DartScriptState(Dart_Isolate, intptr_t libraryId, V8ScriptState*, const String& isolateName);
     ~DartScriptState() { }
 
     Dart_Isolate m_isolate;
     intptr_t m_libraryId;
-    String m_libraryUrl;
+    String m_name;
     RefPtr<V8ScriptState> m_v8ScriptState;
 };
 
 }
 
 #endif // DartScriptState_h