Changeset 25576 in webkit

Timestamp:

Sep 14, 2007, 4:53:29 PM (17 years ago)

Author:

thatcher

Message:

WebCore:

Reviewed by Sam.

<rdar://problem/5472970> REGRESSION (r24276): TinyMCE popups show an empty window with no content

Accessing the document of a window before the load finished would cause the window
object to hold onto the initial empty document, and never switch over to the real document
once the load finished. This regression was caused by r24276 which added a check to prevent
clearing the window object when the load finished. The absence of this clear allowed the
dialogArguments set with showModalDialog to persist on the window after the load. However,
not clearing the window would keep other properties (and the empty document object) around.

So the fix is to store away the dialog arguments that were passed to showModalDialog and
put them back on the window object in the dialogArguments property each time
the window is cleared.

• bindings/js/kjs_window.cpp: (KJS::createWindow): No longer put dialogArguments on the window here. (KJS::showModalDialog): Put dialogArguments on the window and call setDialogArgumentsAndReturnValueSlot to remember the arguments. (KJS::Window::clear): Put m_dialogArguments back on the window as dialogArguments. (KJS::WindowFunc::callAsFunction): Call the new setDialogArgumentsAndReturnValue. (KJS::Window::setDialogArgumentsAndReturnValue): Store the arguments in m_dialogArguments.
• bindings/js/kjs_window.h: Rename setReturnValueSlot to setDialogArgumentsAndReturnValueSlot.
• manual-tests/modal-dialog-arguments.html: Confirmed that this test still passes.

Reverted r24276 which was all the changes in FrameLoader.cpp and FrameLoader.h.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::FrameLoader): Remove m_shouldClearWindowProperties. (WebCore::FrameLoader::createWindow): Remove the call to setShouldClearWindowProperties. (WebCore::FrameLoader::clear): No longer check m_shouldClearWindowProperties, clear the window whenever clearWindowProperties is set. (WebCore::FrameLoader::begin): Remove m_shouldClearWindowProperties. (WebCore::FrameLoader::open): Ditto.
• loader/FrameLoader.h: Remove m_shouldClearWindowProperties.

LayoutTests:

Reviewed by Sam.

<rdar://problem/5472970> REGRESSION (r24276): TinyMCE popups show an empty window with no content

• fast/dom/Document/early-document-access.html: Added.
• fast/dom/Document/resources: Added.
• fast/dom/Document/resources/early-document-access-popup.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Document/early-document-access-expected.txt (added)
• LayoutTests/fast/dom/Document/early-document-access.html (added)
• LayoutTests/fast/dom/Document/resources (added)
• LayoutTests/fast/dom/Document/resources/early-document-access-popup.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/kjs_window.cpp (modified) (8 diffs)
• WebCore/bindings/js/kjs_window.h (modified) (1 diff)
• WebCore/loader/FrameLoader.cpp (modified) (5 diffs)
• WebCore/loader/FrameLoader.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-09-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Sam.
+
+        <rdar://problem/5472970> REGRESSION (r24276): TinyMCE popups show an empty window with no content
+
+        * fast/dom/Document/early-document-access.html: Added.
+        * fast/dom/Document/resources: Added.
+        * fast/dom/Document/resources/early-document-access-popup.html: Added.
+
 2007-09-13  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Sam.
+
+        <rdar://problem/5472970> REGRESSION (r24276): TinyMCE popups show an empty window with no content
+
+        Accessing the document of a window before the load finished would cause the window
+        object to hold onto the initial empty document, and never switch over to the real document
+        once the load finished. This regression was caused by r24276 which added a check to prevent
+        clearing the window object when the load finished. The absence of this clear allowed the
+        dialogArguments set with showModalDialog to persist on the window after the load. However,
+        not clearing the window would keep other properties (and the empty document object) around.
+
+        So the fix is to store away the dialog arguments that were passed to showModalDialog and
+        put them back on the window object in the dialogArguments property each time
+        the window is cleared.
+
+        * bindings/js/kjs_window.cpp:
+        (KJS::createWindow): No longer put dialogArguments on the window here.
+        (KJS::showModalDialog): Put dialogArguments on the window and call
+        setDialogArgumentsAndReturnValueSlot to remember the arguments.
+        (KJS::Window::clear): Put m_dialogArguments back on the window as dialogArguments.
+        (KJS::WindowFunc::callAsFunction): Call the new setDialogArgumentsAndReturnValue.
+        (KJS::Window::setDialogArgumentsAndReturnValue): Store the arguments in m_dialogArguments.
+        * bindings/js/kjs_window.h: Rename setReturnValueSlot to setDialogArgumentsAndReturnValueSlot.
+        * manual-tests/modal-dialog-arguments.html: Confirmed that this test still passes.
+
+        Reverted r24276 which was all the changes in FrameLoader.cpp and FrameLoader.h.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::FrameLoader): Remove m_shouldClearWindowProperties.
+        (WebCore::FrameLoader::createWindow): Remove the call to setShouldClearWindowProperties.
+        (WebCore::FrameLoader::clear): No longer check m_shouldClearWindowProperties, clear the
+        window whenever clearWindowProperties is set.
+        (WebCore::FrameLoader::begin): Remove m_shouldClearWindowProperties.
+        (WebCore::FrameLoader::open): Ditto.
+        * loader/FrameLoader.h: Remove m_shouldClearWindowProperties.
+
 2007-09-14  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/bindings/js/kjs_window.cpp

@@ -95 +95 @@
     mutable Location* loc;
     WebCore::Event *m_evt;
-    JSValue **m_returnValueSlot;
+    JSValue* m_dialogArguments;
+    JSValue** m_returnValueSlot;
     typedef HashMap<int, DOMWindowTimer*> TimeoutsMap;
     TimeoutsMap m_timeouts;
@@ -359 +360 @@
 
 static Frame* createWindow(ExecState* exec, Frame* openerFrame, const String& url,
-    const String& frameName, const WindowFeatures& windowFeatures, JSValue* dialogArgs)
+    const String& frameName, const WindowFeatures& windowFeatures)
 {
     Frame* activeFrame = Window::retrieveActive(exec)->impl()->frame();
@@ -371 +372 @@
     // know what URL we are going to open. Unfortunately, this code passes the empty string
     // for the URL, but there's a reason for that. Before loading we have to set up the opener,
-    // openedByJS, and dialogArguments values. Also, to decide whether to use the URL we currently
+    // openedByDOM, and dialogArguments values. Also, to decide whether to use the URL we currently
     // do an isSafeScript call using the window we create, which can't be done before creating it.
     // We'd have to resolve all those issues to pass the URL instead of "".
@@ -385 +386 @@
     Window* newWindow = Window::retrieveWindow(newFrame);    
     
-    if (dialogArgs)
-        newWindow->putDirect("dialogArguments", dialogArgs);
-
     if (!url.startsWith("javascript:", false) || newWindow->isSafeScript(exec)) {
         String completedURL = url.isEmpty() ? url : activeFrame->document()->completeURL(url);
@@ -477 +475 @@
     wargs.fullscreen = false;
     
-    Frame* dialogFrame = createWindow(exec, frame, valueToStringWithUndefinedOrNullCheck(exec, args[0]), "", wargs, args[1]);
+    Frame* dialogFrame = createWindow(exec, frame, valueToStringWithUndefinedOrNullCheck(exec, args[0]), "", wargs);
     if (!dialogFrame)
         return jsUndefined();
 
     Window* dialogWindow = Window::retrieveWindow(dialogFrame);
+
+    dialogWindow->putDirect("dialogArguments", args[1]);
 
     // Get the return value either just before clearing the dialog window's
     // properties (in Window::clear), or when on return from runModal.
     JSValue* returnValue = 0;
-    dialogWindow->setReturnValueSlot(&returnValue);
+    dialogWindow->setDialogArgumentsAndReturnValueSlot(args[1], &returnValue);
     dialogFrame->page()->chrome()->runModal();
-    dialogWindow->setReturnValueSlot(0);
+    dialogWindow->setDialogArgumentsAndReturnValueSlot(0, 0);
 
     // If we don't have a return value, get it now.
@@ -1049 +1049 @@
     frame->scriptProxy()->interpreter()->initGlobalObject();
 
+  if (d->m_dialogArguments)
+    putDirect("dialogArguments", d->m_dialogArguments);
+
   // there's likely to be lots of garbage now
   gcController().garbageCollectSoon();
@@ -1301 +1304 @@
       windowFeatures.width = windowRect.width();
 
-      frame = createWindow(exec, frame, urlString, frameName, windowFeatures, 0);
+      frame = createWindow(exec, frame, urlString, frameName, windowFeatures);
 
       if (!frame)
@@ -1444 +1447 @@
 }
 
-void Window::setReturnValueSlot(JSValue **slot)
-{ 
-    d->m_returnValueSlot = slot; 
+void Window::setDialogArgumentsAndReturnValueSlot(JSValue* dialogArgs, JSValue** returnValueSlot)
+{
+    d->m_dialogArguments = dialogArgs;
+    d->m_returnValueSlot = returnValueSlot; 
 }
 

trunk/WebCore/bindings/js/kjs_window.h

@@ -129 +129 @@
 
     // Set a place to put a dialog return value when the window is cleared.
-    void setReturnValueSlot(JSValue **slot);
+    void setDialogArgumentsAndReturnValueSlot(JSValue* arguments, JSValue** returnValueSlot);
 
     typedef HashMap<JSObject*, WebCore::JSEventListener*> ListenersMap;

trunk/WebCore/loader/FrameLoader.cpp

@@ -228 +228 @@
     , m_cancellingWithLoadInProgress(false)
     , m_needsClear(false)
-    , m_shouldClearWindowProperties(true)
     , m_receivedData(false)
     , m_encodingWasChosenByUser(false)
@@ -318 +317 @@
         frame->tree()->setName(request.frameName());
 
-    frame->loader()->setShouldClearWindowProperties(false);
-    
     page->chrome()->setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);
     page->chrome()->setStatusbarVisible(features.statusBarVisible);
@@ -789 +786 @@
 
     // Do this after detaching the document so that the unload event works.
-    if (clearWindowProperties && m_shouldClearWindowProperties) {
+    if (clearWindowProperties) {
         m_frame->clearScriptProxy();
         m_frame->clearDOMWindow();
@@ -871 +868 @@
 
     m_needsClear = true;
-    m_shouldClearWindowProperties = true;
     m_isComplete = false;
     m_didCallImplicitClose = false;
@@ -2686 +2682 @@
 
     m_needsClear = true;
-    m_shouldClearWindowProperties = true;
     m_isComplete = false;
     m_didCallImplicitClose = false;

trunk/WebCore/loader/FrameLoader.h

@@ -563 +563 @@
         bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length);
 
-        void setShouldClearWindowProperties(bool shouldClearWindowProperties) { m_shouldClearWindowProperties = shouldClearWindowProperties; }
-        
         Frame* m_frame;
         FrameLoaderClient* m_client;
@@ -617 +615 @@
 
         bool m_needsClear;
-        bool m_shouldClearWindowProperties;
         bool m_receivedData;