Changeset 139610 in webkit

Timestamp:

Jan 14, 2013 5:08:17 AM (11 years ago)

Author:

haraken@chromium.org

Message:

[V8] Add m_isolate to ScriptController, WorkerScriptController and V8DOMWindowShell
​https://bugs.webkit.org/show_bug.cgi?id=106771

Reviewed by Adam Barth.

This is one of the steps to pass an Isolate everywhere.

No tests. No change in behavior.

• bindings/v8/ScriptController.cpp:

(WebCore::ScriptController::ScriptController):
(WebCore::ScriptController::windowShell):

• bindings/v8/ScriptController.h:

(ScriptController):

• bindings/v8/V8DOMWindowShell.cpp:

(WebCore::V8DOMWindowShell::create):
(WebCore::V8DOMWindowShell::V8DOMWindowShell):
(WebCore::V8DOMWindowShell::initializeIfNeeded):
(WebCore::V8DOMWindowShell::installDOMWindow):

• bindings/v8/V8DOMWindowShell.h:

(V8DOMWindowShell):

• bindings/v8/V8Initializer.cpp:

(WebCore::V8Initializer::initializeMainThreadIfNeeded):
(WebCore::V8Initializer::initializeWorker):

• bindings/v8/V8Initializer.h:

(V8Initializer):

• bindings/v8/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::WorkerScriptController):
(WebCore::WorkerScriptController::initializeContextIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (2 diffs)
• bindings/v8/ScriptController.h (modified) (1 diff)
• bindings/v8/V8DOMWindowShell.cpp (modified) (3 diffs)
• bindings/v8/V8DOMWindowShell.h (modified) (3 diffs)
• bindings/v8/V8Initializer.cpp (modified) (5 diffs)
• bindings/v8/V8Initializer.h (modified) (1 diff)
• bindings/v8/WorkerScriptController.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-14  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Add m_isolate to ScriptController, WorkerScriptController and V8DOMWindowShell
+        https://bugs.webkit.org/show_bug.cgi?id=106771
+
+        Reviewed by Adam Barth.
+
+        This is one of the steps to pass an Isolate everywhere.
+
+        No tests. No change in behavior.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::ScriptController):
+        (WebCore::ScriptController::windowShell):
+        * bindings/v8/ScriptController.h:
+        (ScriptController):
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::create):
+        (WebCore::V8DOMWindowShell::V8DOMWindowShell):
+        (WebCore::V8DOMWindowShell::initializeIfNeeded):
+        (WebCore::V8DOMWindowShell::installDOMWindow):
+        * bindings/v8/V8DOMWindowShell.h:
+        (V8DOMWindowShell):
+        * bindings/v8/V8Initializer.cpp:
+        (WebCore::V8Initializer::initializeMainThreadIfNeeded):
+        (WebCore::V8Initializer::initializeWorker):
+        * bindings/v8/V8Initializer.h:
+        (V8Initializer):
+        * bindings/v8/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::WorkerScriptController):
+        (WebCore::WorkerScriptController::initializeContextIfNeeded):
+
 2013-01-14  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/bindings/v8/ScriptController.cpp

@@ -103 +103 @@
     : m_frame(frame)
     , m_sourceURL(0)
-    , m_windowShell(V8DOMWindowShell::create(frame, mainThreadNormalWorld()))
+    , m_isolate(v8::Isolate::GetCurrent())
+    , m_windowShell(V8DOMWindowShell::create(frame, mainThreadNormalWorld(), m_isolate))
     , m_paused(false)
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -358 +359 @@
             shell = iter->value.get();
         else {
-            OwnPtr<V8DOMWindowShell> isolatedWorldShell = V8DOMWindowShell::create(m_frame, world);
+            OwnPtr<V8DOMWindowShell> isolatedWorldShell = V8DOMWindowShell::create(m_frame, world, m_isolate);
             shell = isolatedWorldShell.get();
             m_isolatedWorlds.set(world->worldId(), isolatedWorldShell.release());

trunk/Source/WebCore/bindings/v8/ScriptController.h

@@ -200 +200 @@
     Frame* m_frame;
     const String* m_sourceURL;
+    v8::Isolate* m_isolate;
 
     OwnPtr<V8DOMWindowShell> m_windowShell;

trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp

@@ -82 +82 @@
 }
 
-PassOwnPtr<V8DOMWindowShell> V8DOMWindowShell::create(Frame* frame, PassRefPtr<DOMWrapperWorld> world)
-{
-    return adoptPtr(new V8DOMWindowShell(frame, world));
-}
-
-V8DOMWindowShell::V8DOMWindowShell(Frame* frame, PassRefPtr<DOMWrapperWorld> world)
+PassOwnPtr<V8DOMWindowShell> V8DOMWindowShell::create(Frame* frame, PassRefPtr<DOMWrapperWorld> world, v8::Isolate* isolate)
+{
+    return adoptPtr(new V8DOMWindowShell(frame, world, isolate));
+}
+
+V8DOMWindowShell::V8DOMWindowShell(Frame* frame, PassRefPtr<DOMWrapperWorld> world, v8::Isolate* isolate)
     : m_frame(frame)
     , m_world(world)
+    , m_isolate(isolate)
 {
 }
@@ -202 +203 @@
     v8::HandleScope handleScope;
 
-    V8Initializer::initializeMainThreadIfNeeded();
+    V8Initializer::initializeMainThreadIfNeeded(m_isolate);
 
     createContext();
@@ -335 +336 @@
     V8DOMWrapper::setNativeInfo(innerGlobalObject, &V8DOMWindow::info, window);
     innerGlobalObject->SetPrototype(windowWrapper);
-    V8DOMWrapper::associateObjectWithWrapper(PassRefPtr<DOMWindow>(window), &V8DOMWindow::info, windowWrapper);
+    V8DOMWrapper::associateObjectWithWrapper(PassRefPtr<DOMWindow>(window), &V8DOMWindow::info, windowWrapper, m_isolate);
     return true;
 }

trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.h

@@ -54 +54 @@
 class V8DOMWindowShell {
 public:
-    static PassOwnPtr<V8DOMWindowShell> create(Frame*, PassRefPtr<DOMWrapperWorld>);
+    static PassOwnPtr<V8DOMWindowShell> create(Frame*, PassRefPtr<DOMWrapperWorld>, v8::Isolate*);
 
     v8::Persistent<v8::Context> context() const { return m_context.get(); }
@@ -82 +82 @@
 
 private:
-    V8DOMWindowShell(Frame*, PassRefPtr<DOMWrapperWorld>);
+    V8DOMWindowShell(Frame*, PassRefPtr<DOMWrapperWorld>, v8::Isolate*);
 
     void disposeContext();
@@ -102 +102 @@
     Frame* m_frame;
     RefPtr<DOMWrapperWorld> m_world;
+    v8::Isolate* m_isolate;
 
     OwnPtr<V8PerContextData> m_perContextData;

trunk/Source/WebCore/bindings/v8/V8Initializer.cpp

@@ -41 +41 @@
 #include "V8Location.h"
 #include "V8PerContextData.h"
-#include <v8.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -105 +104 @@
 }
 
-void V8Initializer::initializeMainThreadIfNeeded()
+void V8Initializer::initializeMainThreadIfNeeded(v8::Isolate* isolate)
 {
     ASSERT(isMainThread());
@@ -123 +122 @@
     ScriptProfiler::initialize();
 #endif
-    V8PerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
+    V8PerIsolateData::ensureInitialized(isolate);
 
     // FIXME: Remove the following 2 lines when V8 default has changed.
@@ -158 +157 @@
 static const int kWorkerMaxStackSize = 500 * 1024;
 
-void V8Initializer::initializeWorker()
+void V8Initializer::initializeWorker(v8::Isolate* isolate)
 {
     v8::V8::AddMessageListener(messageHandlerInWorker);
@@ -176 +175 @@
     v8::SetResourceConstraints(&resourceConstraints);
 
-    V8PerIsolateData::ensureInitialized(v8::Isolate::GetCurrent());
+    V8PerIsolateData::ensureInitialized(isolate);
 }
 

trunk/Source/WebCore/bindings/v8/V8Initializer.h

@@ -27 +27 @@
 #define V8Initializer_h
 
+#include <v8.h>
+
 namespace WebCore {
 
 class V8Initializer {
 public:
-    static void initializeMainThreadIfNeeded();
-    static void initializeWorker();
+    static void initializeMainThreadIfNeeded(v8::Isolate*);
+    static void initializeWorker(v8::Isolate*);
 };
     

trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp

@@ -67 +67 @@
     data->setDOMDataStore(m_domDataStore.get());
 
-    V8Initializer::initializeWorker();
+    V8Initializer::initializeWorker(m_isolate);
 }
 
@@ -128 +128 @@
     }
 
-    V8DOMWrapper::associateObjectWithWrapper(PassRefPtr<WorkerContext>(m_workerContext), contextType, jsWorkerContext);
+    V8DOMWrapper::associateObjectWithWrapper(PassRefPtr<WorkerContext>(m_workerContext), contextType, jsWorkerContext, m_isolate);
 
     // Insert the object instance as the prototype of the shadow object.