Changeset 126103 in webkit

Timestamp:

Aug 20, 2012 5:31:09 PM (12 years ago)

Author:

haraken@chromium.org

Message:

[V8] Move retrieve{Window,Frame,PerContextData}() from V8Proxy to V8Binding
​https://bugs.webkit.org/show_bug.cgi?id=94460

Reviewed by Adam Barth.

To kill V8Proxy, we move retrieve{Window,Frame,PerContextData}()
from V8Proxy to V8Binding. Also, this patch renames these methods as follows:

• retrieveWindow() -> toDOMWindow()
• retrieveFrame() -> toFrameIfNotDetached()
• retrievePerContextData() -> perContextDataForCurrentWorld()

No tests. No change in behavior.

Source/WebCore:

• bindings/v8/BindingState.cpp:

(WebCore::activeDOMWindow):
(WebCore::firstDOMWindow):
(WebCore::activeFrame):
(WebCore::firstFrame):
(WebCore::currentFrame):
(WebCore::currentDocument):

• bindings/v8/PageScriptDebugServer.cpp:

(WebCore::retrieveFrameWithGlobalObjectCheck):
(WebCore::PageScriptDebugServer::getDebugListenerForContext):
(WebCore::PageScriptDebugServer::runMessageLoopOnPause):

• bindings/v8/V8Binding.cpp:

(WebCore::retrieveWindow):
(WebCore):
(WebCore::retrieveFrame):
(WebCore::retrievePerContextData):

• bindings/v8/V8Binding.h:

(WebCore):

• bindings/v8/V8DOMWrapper.cpp:

(WebCore::V8DOMWrapper::constructorForType):

• bindings/v8/V8NPUtils.cpp:

(WebCore::convertV8ObjectToNPVariant):

• bindings/v8/V8Proxy.cpp:

(WebCore::V8Proxy::handleOutOfMemory):
(WebCore::V8Proxy::context):
(WebCore::V8Proxy::matchesCurrentContext):

• bindings/v8/V8Proxy.h:

(V8Proxy):

Source/WebKit/chromium:

• src/WebBindings.cpp:

(WebKit::makeIntArrayImpl):
(WebKit::makeStringArrayImpl):

• src/WebFrameImpl.cpp:

(WebKit::WebFrame::frameForContext):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/v8/BindingState.cpp (modified) (5 diffs)
• WebCore/bindings/v8/PageScriptDebugServer.cpp (modified) (4 diffs)
• WebCore/bindings/v8/V8Binding.cpp (modified) (2 diffs)
• WebCore/bindings/v8/V8Binding.h (modified) (1 diff)
• WebCore/bindings/v8/V8DOMWrapper.cpp (modified) (1 diff)
• WebCore/bindings/v8/V8NPUtils.cpp (modified) (1 diff)
• WebCore/bindings/v8/V8Proxy.cpp (modified) (5 diffs)
• WebCore/bindings/v8/V8Proxy.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebBindings.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebFrameImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-20  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Move retrieve{Window,Frame,PerContextData}() from V8Proxy to V8Binding
+        https://bugs.webkit.org/show_bug.cgi?id=94460
+
+        Reviewed by Adam Barth.
+
+        To kill V8Proxy, we move retrieve{Window,Frame,PerContextData}()
+        from V8Proxy to V8Binding. Also, this patch renames these methods as follows:
+
+        - retrieveWindow() -> toDOMWindow()
+        - retrieveFrame() -> toFrameIfNotDetached()
+        - retrievePerContextData() -> perContextDataForCurrentWorld()
+
+        No tests. No change in behavior.
+
+        * bindings/v8/BindingState.cpp:
+        (WebCore::activeDOMWindow):
+        (WebCore::firstDOMWindow):
+        (WebCore::activeFrame):
+        (WebCore::firstFrame):
+        (WebCore::currentFrame):
+        (WebCore::currentDocument):
+        * bindings/v8/PageScriptDebugServer.cpp:
+        (WebCore::retrieveFrameWithGlobalObjectCheck):
+        (WebCore::PageScriptDebugServer::getDebugListenerForContext):
+        (WebCore::PageScriptDebugServer::runMessageLoopOnPause):
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::retrieveWindow):
+        (WebCore):
+        (WebCore::retrieveFrame):
+        (WebCore::retrievePerContextData):
+        * bindings/v8/V8Binding.h:
+        (WebCore):
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::constructorForType):
+        * bindings/v8/V8NPUtils.cpp:
+        (WebCore::convertV8ObjectToNPVariant):
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::handleOutOfMemory):
+        (WebCore::V8Proxy::context):
+        (WebCore::V8Proxy::matchesCurrentContext):
+        * bindings/v8/V8Proxy.h:
+        (V8Proxy):
+
 2012-08-20  Abhishek Arya  <inferno@chromium.org>
 

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

@@ -35 +35 @@
 #include "Frame.h"
 #include "ScriptController.h"
-#include "V8Proxy.h"
+#include "V8Binding.h"
 #include <wtf/StdLibExtras.h>
 
@@ -59 +59 @@
 DOMWindow* activeDOMWindow(BindingState*)
 {
-    return V8Proxy::retrieveWindow(activeContext());
+    return toDOMWindow(activeContext());
 }
 
 DOMWindow* firstDOMWindow(BindingState*)
 {
-    return V8Proxy::retrieveWindow(v8::Context::GetEntered());
+    return toDOMWindow(v8::Context::GetEntered());
 }
 
@@ -72 +72 @@
     if (context.IsEmpty())
         return 0;
-    return V8Proxy::retrieveFrame(context);
+    return toFrameIfNotDetached(context);
 }
 
@@ -80 +80 @@
     if (context.IsEmpty())
         return 0;
-    return V8Proxy::retrieveFrame(context);
+    return toFrameIfNotDetached(context);
 }
 
@@ -88 +88 @@
     if (context.IsEmpty())
         return 0;
-    return V8Proxy::retrieveFrame(context);
+    return toFrameIfNotDetached(context);
 }
 
 Document* currentDocument(BindingState*)
 {
-    DOMWindow* current = V8Proxy::retrieveWindow(v8::Context::GetCurrent());
+    DOMWindow* current = toDOMWindow(v8::Context::GetCurrent());
     if (!current)
         return 0;

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

@@ -48 +48 @@
 namespace WebCore {
 
-static Frame* retrieveFrame(v8::Handle<v8::Context> context)
+static Frame* retrieveFrameWithGlobalObjectCheck(v8::Handle<v8::Context> context)
 {
     if (context.IsEmpty())
@@ -62 +62 @@
         return 0;
 
-    return V8Proxy::retrieveFrame(context);
+    return toFrameIfNotDetached(context);
 }
 
@@ -168 +168 @@
 {
     v8::HandleScope scope;
-    Frame* frame = retrieveFrame(context);
+    Frame* frame = retrieveFrameWithGlobalObjectCheck(context);
     if (!frame)
         return 0;
@@ -177 +177 @@
 {
     v8::HandleScope scope;
-    Frame* frame = retrieveFrame(context);
+    Frame* frame = retrieveFrameWithGlobalObjectCheck(context);
     m_pausedPage = frame->page();
 

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

@@ -35 +35 @@
 #include "DOMStringList.h"
 #include "Element.h"
+#include "Frame.h"
 #include "MemoryInstrumentation.h"
 #include "PlatformString.h"
 #include "QualifiedName.h"
 #include "V8DOMStringList.h"
+#include "V8DOMWindow.h"
 #include "V8Element.h"
 #include "V8ObjectConstructor.h"
-#include "V8Proxy.h"
 
 #include <wtf/MathExtras.h>
@@ -382 +383 @@
 }
 
+DOMWindow* toDOMWindow(v8::Handle<v8::Context> context)
+{
+    v8::Handle<v8::Object> global = context->Global();
+    ASSERT(!global.IsEmpty());
+    global = V8DOMWrapper::lookupDOMWrapper(V8DOMWindow::GetTemplate(), global);
+    ASSERT(!global.IsEmpty());
+    return V8DOMWindow::toNative(global);
+}
+
+Frame* toFrameIfNotDetached(v8::Handle<v8::Context> context)
+{
+    DOMWindow* window = toDOMWindow(context);
+    if (window->isCurrentlyDisplayedInFrame())
+        return window->frame();
+    // We return 0 here because |context| is detached from the Frame. If we
+    // did return |frame| we could get in trouble because the frame could be
+    // navigated to another security origin.
+    return 0;
+}
+
+V8PerContextData* perContextDataForCurrentWorld(Frame* frame)
+{
+    V8IsolatedContext* isolatedContext;
+    if (UNLIKELY(!!(isolatedContext = V8IsolatedContext::getEntered())))
+        return isolatedContext->perContextData();
+    return frame->script()->windowShell()->perContextData();
+}
+
 void crashIfV8IsDead()
 {

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

@@ -369 +369 @@
     PassRefPtr<DOMStringList> toDOMStringList(v8::Handle<v8::Value>);
 
+    // Returns the window object associated with a context.
+    DOMWindow* toDOMWindow(v8::Handle<v8::Context>);
+
+    // Returns the frame object of the window object associated with
+    // a context, if the window is currently being displayed in the Frame.
+    Frame* toFrameIfNotDetached(v8::Handle<v8::Context>);
+
+    // Returns the PerContextData associated with a frame for the current isolated world.
+    V8PerContextData* perContextDataForCurrentWorld(Frame*);
+
     void crashIfV8IsDead();
 

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

@@ -96 +96 @@
         return v8::Local<v8::Function>();
 
-    if (V8PerContextData* contextData = V8Proxy::retrievePerContextData(frame))
+    if (V8PerContextData* contextData = perContextDataForCurrentWorld(frame))
         return contextData->constructorForType(type);
 

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

@@ -70 +70 @@
         STRINGN_TO_NPVARIANT(utf8Chars, length-1, *result);
     } else if (object->IsObject()) {
-        DOMWindow* window = V8Proxy::retrieveWindow(v8::Context::GetCurrent());
+        DOMWindow* window = toDOMWindow(v8::Context::GetCurrent());
         NPObject* npobject = npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(object), window);
         if (npobject)

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

@@ -141 +141 @@
 
     // Warning, error, disable JS for this frame?
-    Frame* frame = V8Proxy::retrieveFrame(context);
+    Frame* frame = toFrameIfNotDetached(context);
     if (!frame)
         return true;
@@ -320 +320 @@
 }
 
-DOMWindow* V8Proxy::retrieveWindow(v8::Handle<v8::Context> context)
-{
-    v8::Handle<v8::Object> global = context->Global();
-    ASSERT(!global.IsEmpty());
-    global = V8DOMWrapper::lookupDOMWrapper(V8DOMWindow::GetTemplate(), global);
-    ASSERT(!global.IsEmpty());
-    return V8DOMWindow::toNative(global);
-}
-
-Frame* V8Proxy::retrieveFrame(v8::Handle<v8::Context> context)
-{
-    DOMWindow* window = retrieveWindow(context);
-    if (window->isCurrentlyDisplayedInFrame())
-        return window->frame();
-    // We return 0 here because |context| is detached from the Frame.  If we
-    // did return |frame| we could get in trouble because the frame could be
-    // navigated to another security origin.
-    return 0;
-}
-
-V8PerContextData* V8Proxy::retrievePerContextData(Frame* frame)
-{
-    V8IsolatedContext* isolatedContext;
-    if (UNLIKELY(!!(isolatedContext = V8IsolatedContext::getEntered())))
-        return isolatedContext->perContextData();
-    return frame->script()->windowShell()->perContextData();
-}
-
 v8::Local<v8::Context> V8Proxy::context(Frame* frame)
 {
@@ -356 +328 @@
     if (V8IsolatedContext* isolatedContext = V8IsolatedContext::getEntered()) {
         context = v8::Local<v8::Context>::New(isolatedContext->context());
-        if (frame != V8Proxy::retrieveFrame(context))
+        if (frame != toFrameIfNotDetached(context))
             return v8::Local<v8::Context>();
     }
@@ -367 +339 @@
     if (V8IsolatedContext* isolatedContext = V8IsolatedContext::getEntered()) {
         RefPtr<SharedPersistent<v8::Context> > context = isolatedContext->sharedContext();
-        if (m_frame != V8Proxy::retrieveFrame(context->get()))
+        if (m_frame != toFrameIfNotDetached(context->get()))
             return v8::Local<v8::Context>();
         return v8::Local<v8::Context>::New(context->get());
@@ -387 +359 @@
     if (V8IsolatedContext* isolatedContext = V8IsolatedContext::getEntered()) {
         context = isolatedContext->sharedContext()->get();
-        if (m_frame != V8Proxy::retrieveFrame(context))
+        if (m_frame != toFrameIfNotDetached(context))
             return false;
     } else {

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

@@ -104 +104 @@
         v8::Local<v8::Value> newInstance(v8::Handle<v8::Function>, int argc, v8::Handle<v8::Value> argv[]);
 
-        // Returns the window object associated with a context.
-        static DOMWindow* retrieveWindow(v8::Handle<v8::Context>);
-
-        // Returns the frame object of the window object associated with
-        // a context.
-        static Frame* retrieveFrame(v8::Handle<v8::Context>);
-
-        static V8PerContextData* retrievePerContextData(Frame*);
-
         // Returns V8 Context of a frame. If none exists, creates
         // a new context. It is potentially slow and consumes memory.

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-08-20  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Move retrieve{Window,Frame,PerContextData}() from V8Proxy to V8Binding
+        https://bugs.webkit.org/show_bug.cgi?id=94460
+
+        Reviewed by Adam Barth.
+
+        To kill V8Proxy, we move retrieve{Window,Frame,PerContextData}()
+        from V8Proxy to V8Binding. Also, this patch renames these methods as follows:
+
+        - retrieveWindow() -> toDOMWindow()
+        - retrieveFrame() -> toFrameIfNotDetached()
+        - retrievePerContextData() -> perContextDataForCurrentWorld()
+
+        No tests. No change in behavior.
+
+        * src/WebBindings.cpp:
+        (WebKit::makeIntArrayImpl):
+        (WebKit::makeStringArrayImpl):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrame::frameForContext):
+
 2012-08-20  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebBindings.cpp

@@ -291 +291 @@
         result->Set(i, v8::Number::New(data[i]));
 
-    DOMWindow* window = V8Proxy::retrieveWindow(v8::Context::GetCurrent());
+    DOMWindow* window = toDOMWindow(v8::Context::GetCurrent());
     return npCreateV8ScriptObject(0, result, window);
 }
@@ -302 +302 @@
         result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data())), data[i].length()) : v8::String::New(""));
 
-    DOMWindow* window = V8Proxy::retrieveWindow(v8::Context::GetCurrent());
+    DOMWindow* window = toDOMWindow(v8::Context::GetCurrent());
     return npCreateV8ScriptObject(0, result, window);
 }

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -584 +584 @@
 #if WEBKIT_USING_V8
 WebFrame* WebFrame::frameForContext(v8::Handle<v8::Context> context)
-{
-    return WebFrameImpl::fromFrame(V8Proxy::retrieveFrame(context));
+{ 
+   return WebFrameImpl::fromFrame(toFrameIfNotDetached(context));
 }
 #endif