Changeset 126096 in webkit

Timestamp:

Aug 20, 2012 4:57:30 PM (12 years ago)

Author:

haraken@chromium.org

Message:

[V8] Remove V8Proxy from V8IsolatedContext
​https://bugs.webkit.org/show_bug.cgi?id=94450

Reviewed by Adam Barth.

This patch removes dependency on V8Proxy from V8IsolatedContext.

No tests. No change in behavior.

• bindings/v8/ScriptController.cpp:

(WebCore::ScriptController::evaluateInIsolatedWorld):

• bindings/v8/V8IsolatedContext.cpp:

(WebCore::V8IsolatedContext::V8IsolatedContext):

• bindings/v8/V8IsolatedContext.h:

(WebCore):
(V8IsolatedContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (2 diffs)
• bindings/v8/V8IsolatedContext.cpp (modified) (3 diffs)
• bindings/v8/V8IsolatedContext.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-20  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Remove V8Proxy from V8IsolatedContext
+        https://bugs.webkit.org/show_bug.cgi?id=94450
+
+        Reviewed by Adam Barth.
+
+        This patch removes dependency on V8Proxy from V8IsolatedContext.
+
+        No tests. No change in behavior.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::evaluateInIsolatedWorld):
+        * bindings/v8/V8IsolatedContext.cpp:
+        (WebCore::V8IsolatedContext::V8IsolatedContext):
+        * bindings/v8/V8IsolatedContext.h:
+        (WebCore):
+        (V8IsolatedContext):
+
 2012-08-20  Philip Rogers  <pdr@google.com>
 

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

@@ -221 +221 @@
                 isolatedContext = iter->second;
             else {
-                isolatedContext = new V8IsolatedContext(proxy(), extensionGroup, worldID);
+                isolatedContext = new V8IsolatedContext(m_frame, extensionGroup, worldID);
                 if (isolatedContext->context().IsEmpty()) {
                     delete isolatedContext;
@@ -235 +235 @@
                 isolatedContext->setSecurityOrigin(securityOriginIter->second);
         } else {
-            isolatedContext = new V8IsolatedContext(proxy(), extensionGroup, worldID);
+            isolatedContext = new V8IsolatedContext(m_frame, extensionGroup, worldID);
             if (isolatedContext->context().IsEmpty()) {
                 delete isolatedContext;

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

@@ -39 +39 @@
 #include "V8DOMWindow.h"
 #include "V8PerContextData.h"
-#include "V8Proxy.h"
 #include <wtf/StringExtras.h>
 
@@ -66 +65 @@
 }
 
-V8IsolatedContext::V8IsolatedContext(V8Proxy* proxy, int extensionGroup, int worldId)
+V8IsolatedContext::V8IsolatedContext(Frame* frame, int extensionGroup, int worldId)
     : m_world(IsolatedWorld::create(worldId)),
-      m_frame(proxy->frame())
+      m_frame(frame)
 {
     v8::HandleScope scope;
-    v8::Handle<v8::Context> mainWorldContext = proxy->windowShell()->context();
+    v8::Handle<v8::Context> mainWorldContext = frame->script()->windowShell()->context();
     if (mainWorldContext.IsEmpty())
         return;
 
     // FIXME: We should be creating a new V8DOMWindowShell here instead of riping out the context.
-    m_context = SharedPersistent<v8::Context>::create(proxy->windowShell()->createNewContext(v8::Handle<v8::Object>(), extensionGroup, m_world->id()));
+    m_context = SharedPersistent<v8::Context>::create(frame->script()->windowShell()->createNewContext(v8::Handle<v8::Object>(), extensionGroup, m_world->id()));
     if (m_context->get().IsEmpty())
         return;
@@ -91 +90 @@
 
     // FIXME: This will go away once we have a windowShell for the isolated world.
-    proxy->windowShell()->installDOMWindow(m_context->get(), m_frame->document()->domWindow());
+    frame->script()->windowShell()->installDOMWindow(m_context->get(), m_frame->document()->domWindow());
 
     // Using the default security token means that the canAccess is always

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

@@ -40 +40 @@
 namespace WebCore {
 
+class Frame;
 class SecurityOrigin;
 class V8PerContextData;
-class V8Proxy;
 
 // V8IsolatedContext
@@ -60 +60 @@
     // Creates an isolated world. To destroy it, call destroy().
     // This will delete the isolated world when the context it owns is GC'd.
-    V8IsolatedContext(V8Proxy*, int extensionGroup, int worldId);
+    V8IsolatedContext(Frame*, int extensionGroup, int worldId);
     ~V8IsolatedContext();