Changeset 128095 in webkit

Timestamp:

Sep 10, 2012 1:21:33 PM (12 years ago)

Author:

abarth@webkit.org

Message:

[V8] V8HTMLDocument::write and friends should not indirect through Frame
​https://bugs.webkit.org/show_bug.cgi?id=96289

Patch by Adam Barth <​abarth@chromium.org> on 2012-09-10
Reviewed by Eric Seidel.

There is no reason why document.write and friends need to indirect
through the Frame to find the active document. This patch makes these
functions work the same as the JSC versions.

• bindings/v8/BindingState.cpp:
• bindings/v8/BindingState.h:
  • This patch removes the last callers of activeFrame, so we can remove the function entirely.
• bindings/v8/custom/V8HTMLDocumentCustom.cpp:

(WebCore::V8HTMLDocument::writeCallback):
(WebCore::V8HTMLDocument::writelnCallback):
(WebCore::V8HTMLDocument::openCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/BindingState.cpp (modified) (1 diff)
• bindings/v8/BindingState.h (modified) (1 diff)
• bindings/v8/custom/V8HTMLDocumentCustom.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Adam Barth  <abarth@chromium.org>
+
+        [V8] V8HTMLDocument::write and friends should not indirect through Frame
+        https://bugs.webkit.org/show_bug.cgi?id=96289
+
+        Reviewed by Eric Seidel.
+
+        There is no reason why document.write and friends need to indirect
+        through the Frame to find the active document. This patch makes these
+        functions work the same as the JSC versions.
+
+        * bindings/v8/BindingState.cpp:
+        * bindings/v8/BindingState.h:
+            - This patch removes the last callers of activeFrame, so we can
+              remove the function entirely.
+        * bindings/v8/custom/V8HTMLDocumentCustom.cpp:
+        (WebCore::V8HTMLDocument::writeCallback):
+        (WebCore::V8HTMLDocument::writelnCallback):
+        (WebCore::V8HTMLDocument::openCallback):
+
 2012-09-10  Adam Barth  <abarth@chromium.org>
 

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

@@ -67 +67 @@
 }
 
-Frame* activeFrame(BindingState*)
-{
-    v8::Handle<v8::Context> context = activeContext();
-    if (context.IsEmpty())
-        return 0;
-    return toFrameIfNotDetached(context);
-}
-
 Frame* firstFrame(BindingState*)
 {

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

@@ -50 +50 @@
 DOMWindow* firstDOMWindow(BindingState*);
 
-Frame* activeFrame(BindingState*);
 Frame* firstFrame(BindingState*);
 

trunk/Source/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp

@@ -120 +120 @@
     INC_STATS("DOM.HTMLDocument.write()");
     HTMLDocument* htmlDocument = V8HTMLDocument::toNative(args.Holder());
-    Frame* frame = activeFrame(BindingState::instance());
-    htmlDocument->write(writeHelperGetString(args), frame ? frame->document() : NULL);
+    htmlDocument->write(writeHelperGetString(args), activeDOMWindow(BindingState::instance())->document());
     return v8::Undefined();
 }
@@ -129 +128 @@
     INC_STATS("DOM.HTMLDocument.writeln()");
     HTMLDocument* htmlDocument = V8HTMLDocument::toNative(args.Holder());
-    Frame* frame = activeFrame(BindingState::instance());
-    htmlDocument->writeln(writeHelperGetString(args), frame ? frame->document() : NULL);
+    htmlDocument->writeln(writeHelperGetString(args), activeDOMWindow(BindingState::instance())->document());
     return v8::Undefined();
 }
@@ -161 +159 @@
     }
 
-    Frame* frame = activeFrame(BindingState::instance());
-    htmlDocument->open(frame ? frame->document() : NULL);
-    // Return the document.
+    htmlDocument->open(activeDOMWindow(BindingState::instance())->document());
     return args.Holder();
 }