Title: [126820] trunk/Source/WebCore
Revision
126820
Author
[email protected]
Date
2012-08-27 16:52:53 -0700 (Mon, 27 Aug 2012)

Log Message

[V8] Inline V8DOMWindowShell::clearDocumentWrapper
https://bugs.webkit.org/show_bug.cgi?id=95133

Reviewed by Eric Seidel.

Now that we use ScopedPersistent for m_document, clearDocumentWrapper
is just one line. It's clearer to just inline it into its callers.

* bindings/v8/V8DOMWindowShell.cpp:
(WebCore::V8DOMWindowShell::clearForClose):
(WebCore::V8DOMWindowShell::clearForNavigation):
(WebCore::V8DOMWindowShell::updateDocumentWrapper):
    - Notice that ScopedPersistent::set already calls clear, so there's
      no reason to call clear redundantly.
* bindings/v8/V8DOMWindowShell.h:
(V8DOMWindowShell):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (126819 => 126820)


--- trunk/Source/WebCore/ChangeLog	2012-08-27 23:39:55 UTC (rev 126819)
+++ trunk/Source/WebCore/ChangeLog	2012-08-27 23:52:53 UTC (rev 126820)
@@ -1,3 +1,22 @@
+2012-08-27  Adam Barth  <[email protected]>
+
+        [V8] Inline V8DOMWindowShell::clearDocumentWrapper
+        https://bugs.webkit.org/show_bug.cgi?id=95133
+
+        Reviewed by Eric Seidel.
+
+        Now that we use ScopedPersistent for m_document, clearDocumentWrapper
+        is just one line. It's clearer to just inline it into its callers.
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::clearForClose):
+        (WebCore::V8DOMWindowShell::clearForNavigation):
+        (WebCore::V8DOMWindowShell::updateDocumentWrapper):
+            - Notice that ScopedPersistent::set already calls clear, so there's
+              no reason to call clear redundantly.
+        * bindings/v8/V8DOMWindowShell.h:
+        (V8DOMWindowShell):
+
 2012-08-27  Dana Jansens  <[email protected]>
 
         [chromium] A general mechanism for passing data into and out of appendQuads and quadCuller via CCAppendQuadsData

Modified: trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp (126819 => 126820)


--- trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp	2012-08-27 23:39:55 UTC (rev 126819)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp	2012-08-27 23:52:53 UTC (rev 126820)
@@ -213,7 +213,7 @@
         return;
 
     v8::HandleScope handleScope;
-    clearDocumentWrapper();
+    m_document.clear();
     disposeContext();
 }
 
@@ -223,7 +223,7 @@
         return;
 
     v8::HandleScope handleScope;
-    clearDocumentWrapper();
+    m_document.clear();
 
     // FIXME: Should we create a new Local handle here?
     v8::Context::Scope contextScope(m_context.get());
@@ -398,17 +398,9 @@
 
 void V8DOMWindowShell::updateDocumentWrapper(v8::Handle<v8::Object> wrapper)
 {
-    clearDocumentWrapper();
-
-    ASSERT(m_document.isEmpty());
     m_document.set(wrapper);
 }
 
-void V8DOMWindowShell::clearDocumentWrapper()
-{
-    m_document.clear();
-}
-
 void V8DOMWindowShell::updateDocumentProperty()
 {
     v8::HandleScope handleScope;

Modified: trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.h (126819 => 126820)


--- trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.h	2012-08-27 23:39:55 UTC (rev 126819)
+++ trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.h	2012-08-27 23:52:53 UTC (rev 126820)
@@ -87,7 +87,6 @@
     void disposeContext();
 
     void setSecurityToken();
-    void clearDocumentWrapper();
 
     // The _javascript_ wrapper for the document object is cached on the global
     // object for fast access. UpdateDocumentProperty sets the wrapper
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to