Changeset 61466 in webkit

Timestamp:

Jun 18, 2010 11:54:24 PM (14 years ago)

Author:

aa@chromium.org

Message:

2010-06-18 Aaron Boodman <​aa@chromium.org>

WebKit API: Undo static hooks into V8 when WebKit is shut down.
​https://bugs.webkit.org/show_bug.cgi?id=40816

• bindings/v8/V8DOMWindowShell.cpp: (WebCore::V8DOMWindowShell::initContextIfNeeded): (WebCore::V8DOMWindowShell::initializeV8IfNeeded): (WebCore::V8DOMWindowShell::uninitializeV8IfNeeded):
• bindings/v8/V8DOMWindowShell.h:

2010-06-18 Aaron Boodman <​aa@chromium.org>

WebKit API: Undo static hooks into V8 when WebKit is shut downm
​https://bugs.webkit.org/show_bug.cgi?id=40816

• src/WebKit.cpp: (WebKit::shutdown): Call new WebCore::V8DOMWindowShell::uninitializeV8IfNeeded().

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/v8/V8DOMWindowShell.cpp (modified) (3 diffs)
• WebCore/bindings/v8/V8DOMWindowShell.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebKit.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-18  Aaron Boodman  <aa@chromium.org>
+
+        WebKit API: Undo static hooks into V8 when WebKit is shut down.
+        https://bugs.webkit.org/show_bug.cgi?id=40816
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::initContextIfNeeded):
+        (WebCore::V8DOMWindowShell::initializeV8IfNeeded):
+        (WebCore::V8DOMWindowShell::uninitializeV8IfNeeded):
+        * bindings/v8/V8DOMWindowShell.h:
+
 2010-06-18  Jessie Berlin  <jberlin@webkit.org>
 

trunk/WebCore/bindings/v8/V8DOMWindowShell.cpp

@@ -117 +117 @@
         V8Proxy::reportUnsafeAccessTo(target, V8Proxy::ReportLater);
 }
+
+bool V8DOMWindowShell::s_isV8Initialized = false;
 
 PassRefPtr<V8DOMWindowShell> V8DOMWindowShell::create(Frame* frame)
@@ -248 +250 @@
     v8::HandleScope handleScope;
 
-    // Setup the security handlers and message listener. This only has
-    // to be done once.
-    static bool isV8Initialized = false;
-    if (!isV8Initialized) {
-        // Tells V8 not to call the default OOM handler, binding code
-        // will handle it.
-        v8::V8::IgnoreOutOfMemoryException();
-        v8::V8::SetFatalErrorHandler(reportFatalErrorInV8);
-
-        v8::V8::SetGlobalGCPrologueCallback(&V8GCController::gcPrologue);
-        v8::V8::SetGlobalGCEpilogueCallback(&V8GCController::gcEpilogue);
-
-        v8::V8::AddMessageListener(&V8ConsoleMessage::handler);
-
-        v8::V8::SetFailedAccessCheckCallbackFunction(reportUnsafeJavaScriptAccess);
-
-        isV8Initialized = true;
-    }
-
+    initializeV8IfNeeded();
 
     m_context = createNewContext(m_global, 0);
@@ -309 +293 @@
 }
 
+void V8DOMWindowShell::initializeV8IfNeeded()
+{
+    if (s_isV8Initialized)
+      return;
+
+    // Tells V8 not to call the default OOM handler, binding code
+    // will handle it.
+    v8::V8::IgnoreOutOfMemoryException();
+    v8::V8::SetFatalErrorHandler(reportFatalErrorInV8);
+
+    v8::V8::SetGlobalGCPrologueCallback(&V8GCController::gcPrologue);
+    v8::V8::SetGlobalGCEpilogueCallback(&V8GCController::gcEpilogue);
+
+    v8::V8::AddMessageListener(&V8ConsoleMessage::handler);
+
+    v8::V8::SetFailedAccessCheckCallbackFunction(reportUnsafeJavaScriptAccess);
+
+    s_isV8Initialized = true;
+}
+
+void V8DOMWindowShell::uninitializeV8IfNeeded()
+{
+    if (!s_isV8Initialized)
+      return;
+
+    v8::V8::SetFatalErrorHandler(0);
+    v8::V8::SetGlobalGCPrologueCallback(0);
+    v8::V8::SetGlobalGCEpilogueCallback(0);
+    v8::V8::SetFailedAccessCheckCallbackFunction(0);
+    v8::V8::RemoveMessageListeners(&V8ConsoleMessage::handler);
+
+    // FIXME: This one cannot be undone yet.
+    // v8::V8::IgnoreOutOfMemoryException();
+
+    s_isV8Initialized = false;
+}
+
 v8::Persistent<v8::Context> V8DOMWindowShell::createNewContext(v8::Handle<v8::Object> global, int extensionGroup)
 {

trunk/WebCore/bindings/v8/V8DOMWindowShell.h

@@ -51 +51 @@
 public:
     static PassRefPtr<V8DOMWindowShell> create(Frame*);
+    static void initializeV8IfNeeded();
+    static void uninitializeV8IfNeeded();
 
     v8::Handle<v8::Context> context() const { return m_context; }
@@ -120 +122 @@
     v8::Persistent<v8::Object> m_global;
     v8::Persistent<v8::Object> m_document;
+
+    static bool s_isV8Initialized;
 };
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-18  Aaron Boodman  <aa@chromium.org>
+
+        WebKit API: Undo static hooks into V8 when WebKit is shut downm
+        https://bugs.webkit.org/show_bug.cgi?id=40816
+
+        * src/WebKit.cpp:
+        (WebKit::shutdown): Call new WebCore::V8DOMWindowShell::uninitializeV8IfNeeded().
+
 2010-06-18  Drew Wilson  <atwilson@chromium.org>
 

trunk/WebKit/chromium/src/WebKit.cpp

@@ -42 +42 @@
 #include "WorkerContextExecutionProxy.h"
 
+#if USE(V8)
+#include "V8DOMWindowShell.h"
+#endif
+
 #include <wtf/Assertions.h>
 #include <wtf/Threading.h>
@@ -79 +83 @@
 void shutdown()
 {
+#if USE(V8)
+    WebCore::V8DOMWindowShell::uninitializeV8IfNeeded();
+#endif
     s_webKitClient = 0;
 }