Changeset 71354 in webkit

Timestamp:

Nov 4, 2010 1:41:43 PM (13 years ago)

Author:

robert@webkit.org

Message:

2010-11-04 Robert Hogan <​robert@webkit.org>

Reviewed by Darin Adler.

Stale reference to JSDOMWindow in ScriptController::m_cacheableBindingObject

Unskip fast/dom/nodesFromRect-basic.html on Qt.

​https://bugs.webkit.org/show_bug.cgi?id=48758

• platform/qt/Skipped:

2010-11-04 Robert Hogan <​robert@webkit.org>

Reviewed by Darin Adler.

Stale reference to JSDOMWindow in ScriptController::m_cacheableBindingObject

After bug 37725 we need to update the globalObject() (i.e. JSDOMWindow)
associated with the m_cacheablebindingRootObject every time we clear the
frame and load a new page. This allows the runtime objects
(e.g. LayoutTestController etc.) to persist between navigations as
before but also ensures that when qt_runtime, or any other bridge,
looks at the root->globalObject() of a cacheable binding object
it gets the DOMWindow of the current page rather than the DOMWindow
that was in place when m_cacheableBindingRootObject was created.

Fixes fast/dom/nodesFromRect-basic.html on Qt.

​https://bugs.webkit.org/show_bug.cgi?id=48758

• bindings/js/ScriptController.cpp: (WebCore::ScriptController::clearWindowShell):
• bridge/runtime_root.cpp: (JSC::Bindings::RootObject::updateGlobalObject):
• bridge/runtime_root.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/ScriptController.cpp (modified) (1 diff)
• WebCore/bridge/runtime_root.cpp (modified) (1 diff)
• WebCore/bridge/runtime_root.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-11-04  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Stale reference to JSDOMWindow in ScriptController::m_cacheableBindingObject
+
+        Unskip fast/dom/nodesFromRect-basic.html on Qt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48758
+
+        * platform/qt/Skipped:
+
 2010-11-04  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5462 +5462 @@
 fast/images/webp-image-decoding.html
 
-# [Qt] DRT sideeffect revealed by r71004
-# https://bugs.webkit.org/show_bug.cgi?id=48758
-fast/dom/nodesFromRect-basic.html
-
 # [Qt] DRT sideeffect revealed by r71268
 # https://bugs.webkit.org/show_bug.cgi?id=48958

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-04  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Stale reference to JSDOMWindow in ScriptController::m_cacheableBindingObject
+
+        After bug 37725 we need to update the globalObject() (i.e. JSDOMWindow)
+        associated with the m_cacheablebindingRootObject every time we clear the
+        frame and load a new page. This allows the runtime objects
+        (e.g. LayoutTestController etc.) to persist between navigations as
+        before but also ensures that when qt_runtime, or any other bridge,
+        looks at the root->globalObject() of a cacheable binding object
+        it gets the DOMWindow of the current page rather than the DOMWindow
+        that was in place when m_cacheableBindingRootObject was created.
+
+        Fixes fast/dom/nodesFromRect-basic.html on Qt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48758
+
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::clearWindowShell):
+        * bridge/runtime_root.cpp:
+        (JSC::Bindings::RootObject::updateGlobalObject):
+        * bridge/runtime_root.h:
+
 2010-11-04  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebCore/bindings/js/ScriptController.cpp

@@ -198 +198 @@
         windowShell->setWindow(m_frame->domWindow());
 
+        // An m_cacheableBindingRootObject persists between page navigations
+        // so needs to know about the new JSDOMWindow.
+        if (m_cacheableBindingRootObject)
+            m_cacheableBindingRootObject->updateGlobalObject(windowShell->window());
+
         if (Page* page = m_frame->page()) {
             attachDebugger(windowShell, page->debugger());

trunk/WebCore/bridge/runtime_root.cpp

@@ -169 +169 @@
 }
 
+void RootObject::updateGlobalObject(JSGlobalObject* globalObject)
+{
+    m_globalObject = globalObject;
+}
+
 void RootObject::addRuntimeObject(RuntimeObject* object)
 {

trunk/WebCore/bridge/runtime_root.h

@@ -70 +70 @@
     const void* nativeHandle() const;
     JSGlobalObject* globalObject() const;
+    void updateGlobalObject(JSGlobalObject*);
 
     void addRuntimeObject(RuntimeObject*);