Changeset 71892 in webkit

Timestamp:

Nov 11, 2010 10:51:46 PM (13 years ago)

Author:

hamaji@chromium.org

Message:

2010-11-11 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by Darin Adler.

REGRESSION: window.print in onload doesn't fire if there's an img
​https://bugs.webkit.org/show_bug.cgi?id=48195

This issue was introduced in
​https://bugs.webkit.org/show_bug.cgi?id=43658
This happens because FrameLoader::isLoading() is false while an
image is still loading. Now, window.print() happens after all
resources are loaded.

Also changed the name of a member variable as Darin suggested in Bug 43658.

Added a manual test as DRT doesn't support window.print() yet.

• loader/DocumentLoader.cpp: (WebCore::DocumentLoader::DocumentLoader): (WebCore::DocumentLoader::updateLoading):
• loader/DocumentLoader.h:
• page/DOMWindow.cpp: (WebCore::DOMWindow::DOMWindow): (WebCore::DOMWindow::print): (WebCore::DOMWindow::finishedLoading):
• page/DOMWindow.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.cpp (modified) (1 diff)
• manual-tests/print-onload-with-image.html (added)
• page/DOMWindow.cpp (modified) (3 diffs)
• page/DOMWindow.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-11  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION: window.print in onload doesn't fire if there's an img
+        https://bugs.webkit.org/show_bug.cgi?id=48195
+
+        This issue was introduced in
+        https://bugs.webkit.org/show_bug.cgi?id=43658
+        This happens because FrameLoader::isLoading() is false while an
+        image is still loading. Now, window.print() happens after all
+        resources are loaded.
+
+        Also changed the name of a member variable as Darin suggested in Bug 43658.
+
+        Added a manual test as DRT doesn't support window.print() yet.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::DocumentLoader):
+        (WebCore::DocumentLoader::updateLoading):
+        * loader/DocumentLoader.h:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::DOMWindow):
+        (WebCore::DOMWindow::print):
+        (WebCore::DOMWindow::finishedLoading):
+        * page/DOMWindow.h:
+
 2010-11-11  James Simonsen  <simonjam@chromium.org>
 

trunk/WebCore/loader/DocumentLoader.cpp

@@ -35 +35 @@
 #include "CachedPage.h"
 #include "CachedResourceLoader.h"
+#include "DOMWindow.h"
 #include "Document.h"
 #include "DocumentParser.h"
@@ -357 +358 @@
     }
     ASSERT(this == frameLoader()->activeDocumentLoader());
+    bool wasLoading = m_loading;
     setLoading(frameLoader()->isLoading());
+
+    if (wasLoading && !m_loading) {
+        if (DOMWindow* window = m_frame->existingDOMWindow())
+            window->finishedLoading();
+    }
 }
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -2177 +2177 @@
     m_client->dispatchDidLoadMainResource(dl.get());
     checkLoadComplete();
-
-    DOMWindow* window = m_frame->existingDOMWindow();
-    if (window && window->printDeferred())
-        window->print();
 }
 

trunk/WebCore/page/DOMWindow.cpp

@@ -393 +393 @@
 
 DOMWindow::DOMWindow(Frame* frame)
-    : m_printDeferred(false),
-      m_frame(frame)
+    : m_shouldPrintWhenFinishedLoading(false)
+    , m_frame(frame)
 {
 }
@@ -893 +893 @@
         return;
 
-    if (m_frame->loader()->isLoading()) {
-        m_printDeferred = true;
-        return;
-    }
-    m_printDeferred = false;
+    if (m_frame->loader()->activeDocumentLoader()->isLoading()) {
+        m_shouldPrintWhenFinishedLoading = true;
+        return;
+    }
+    m_shouldPrintWhenFinishedLoading = false;
     page->chrome()->print(m_frame);
 }
@@ -1568 +1568 @@
 }
 
+void DOMWindow::finishedLoading()
+{
+    if (m_shouldPrintWhenFinishedLoading) {
+        m_shouldPrintWhenFinishedLoading = false;
+        print();
+    }
+}
+
 EventTargetData* DOMWindow::eventTargetData()
 {

trunk/WebCore/page/DOMWindow.h

@@ -92 +92 @@
         virtual ScriptExecutionContext* scriptExecutionContext() const;
 
-        bool printDeferred() const { return m_printDeferred; }
         Frame* frame() const { return m_frame; }
         void disconnectFrame();
@@ -367 +366 @@
         void releaseEvents();
 
+        void finishedLoading();
+
         // These methods are used for GC marking. See JSDOMWindow::markChildren(MarkStack&) in
         // JSDOMWindowCustom.cpp.
@@ -411 +412 @@
         KURL m_url;
 
-        bool m_printDeferred;
+        bool m_shouldPrintWhenFinishedLoading;
         Frame* m_frame;
         mutable RefPtr<Screen> m_screen;