EndPrinting message should be sent synchronously when printing was initiated...

        https://bugs.webkit.org/show_bug.cgi?id=84049
        <rdar://problem/11096575>

        Reviewed by Oliver Hunt.

        * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::printFrame): When printing is
        initiated by WebProcess, all messages from UI process are sent synchronously to
        avoid being queued, and so should EndPrinting.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 0b546f7..172ec9f 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-16  Alexey Proskuryakov  <ap@apple.com>
+
+        EndPrinting message should be sent synchronously when printing was initiated from DOM.
+        https://bugs.webkit.org/show_bug.cgi?id=84049
+        <rdar://problem/11096575>
+
+        Reviewed by Oliver Hunt.
+
+        * UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::printFrame): When printing is
+        initiated by WebProcess, all messages from UI process are sent synchronously to
+        avoid being queued, and so should EndPrinting.
+
 2012-04-16  Brady Eidson  <beidson@apple.com>
 
         <rdar://problem/11249336> and https://bugs.webkit.org/show_bug.cgi?id=84050

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 2eda08c..12d9613 100644 (file)
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -2442,6 +2442,7 @@ void WebPageProxy::printFrame(uint64_t frameID)
 
     m_uiClient.printFrame(this, frame);
 
+    endPrinting(); // Send a message synchronously while m_isPerformingDOMPrintOperation is still true.
     m_isPerformingDOMPrintOperation = false;
 }