Changeset 127976 in webkit

Timestamp:

Sep 8, 2012 11:48:14 PM (12 years ago)

Author:

abarth@webkit.org

Message:

[V8] unsafeHandleToCurrentWorldContext doesn't need to exist
​https://bugs.webkit.org/show_bug.cgi?id=96191

Reviewed by Kentaro Hara.

Previously, we used this function when instantiating DOM wrappers. Now
we get the context from the creationContext, so we don't need access to
this unsafe handle. This patch inlines the function into its one other
caller.

• bindings/v8/ScriptController.cpp:

(WebCore::ScriptController::currentWorldContext):

• bindings/v8/ScriptController.h:

(ScriptController):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (1 diff)
• bindings/v8/ScriptController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-08  Adam Barth  <abarth@webkit.org>
+
+        [V8] unsafeHandleToCurrentWorldContext doesn't need to exist
+        https://bugs.webkit.org/show_bug.cgi?id=96191
+
+        Reviewed by Kentaro Hara.
+
+        Previously, we used this function when instantiating DOM wrappers. Now
+        we get the context from the creationContext, so we don't need access to
+        this unsafe handle. This patch inlines the function into its one other
+        caller.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::currentWorldContext):
+        * bindings/v8/ScriptController.h:
+        (ScriptController):
+
 2012-09-08  Benjamin Poulain  <bpoulain@apple.com>
 

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

@@ -412 +412 @@
 }
 
-v8::Persistent<v8::Context> ScriptController::unsafeHandleToCurrentWorldContext()
+v8::Local<v8::Context> ScriptController::currentWorldContext()
 {
     if (V8IsolatedContext* isolatedContext = V8IsolatedContext::getEntered()) {
         RefPtr<SharedPersistent<v8::Context> > context = isolatedContext->sharedContext();
         if (m_frame != toFrameIfNotDetached(context->get()))
-            return v8::Persistent<v8::Context>();
-        return context->get();
+            return v8::Local<v8::Context>();
+        return v8::Local<v8::Context>::New(context->get());
     }
     windowShell()->initializeIfNeeded();
-    return windowShell()->context();
-}
-
-v8::Local<v8::Context> ScriptController::currentWorldContext()
-{
-    return v8::Local<v8::Context>::New(unsafeHandleToCurrentWorldContext());
+    return v8::Local<v8::Context>::New(windowShell()->context());
 }
 

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

@@ -173 +173 @@
     v8::Local<v8::Context> currentWorldContext();
 
-    // WARNING! The handle returned by this function might be Disposed() when JavaScript is executed.
-    v8::Persistent<v8::Context> unsafeHandleToCurrentWorldContext();
-
     // Pass command-line flags to the JS engine.
     static void setFlags(const char* string, int length);