Views should be made visible before painting in WM_PRINTCLIENT messages

b-weinstein · b-weinstein · commit 71f824245fe3 · 2011-04-15T19:46:49.000Z
https://bugs.webkit.org/show_bug.cgi?id=58676 <rdar://problem/9279211> Reviewed by Adam Roben. * UIProcess/win/WebView.cpp: (WebKit::WebView::onPrintClientEvent): If our view isn't currently visible set it to visible before painting, then reset it back to not visible after painting. (WebKit::WebView::onShowWindowEvent): Call setIsVisible instead of duplicating logic. (WebKit::WebView::setIsVisible): Set the m_isVisible flag and call viewStateDidChange. * UIProcess/win/WebView.h: Canonical link: https://commits.webkit.org/73762@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84019 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2011-04-15  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Views should be made visible before painting in WM_PRINTCLIENT messages
+        https://bugs.webkit.org/show_bug.cgi?id=58676
+        <rdar://problem/9279211>
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::onPrintClientEvent): If our view isn't currently visible set it to visible
+            before painting, then reset it back to not visible after painting.
+        (WebKit::WebView::onShowWindowEvent): Call setIsVisible instead of duplicating logic.
+        (WebKit::WebView::setIsVisible): Set the m_isVisible flag and call viewStateDidChange.
+        * UIProcess/win/WebView.h:
+
 2011-04-15  Jon Lee  <jonlee@apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebKit2/UIProcess/win/WebView.cpp b/Source/WebKit2/UIProcess/win/WebView.cpp
@@ -691,8 +691,22 @@ LRESULT WebView::onPrintClientEvent(HWND hWnd, UINT, WPARAM wParam, LPARAM, bool
     RECT winRect;
     ::GetClientRect(hWnd, &winRect);
 
+    // Twidding the visibility flags tells the DrawingArea to resume painting. Right now, the
+    // the visible state of the view only affects whether or not painting happens, but in the
+    // future it could affect more, which we wouldn't want to touch here.
+
+    // FIXME: We should have a better way of telling the WebProcess to draw even if we're
+    // invisible than twiddling the visibility flag.
+
+    bool wasVisible = isViewVisible();
+    if (!wasVisible)
+        setIsVisible(true);
+
     paint(hdc, winRect);
 
+    if (!wasVisible)
+        setIsVisible(false);
+
     handled = true;
     return 0;
 }
@@ -752,11 +766,8 @@ LRESULT WebView::onShowWindowEvent(HWND hWnd, UINT message, WPARAM wParam, LPARA
     // lParam is 0 when the message is sent because of a ShowWindow call.
     // FIXME: Since we don't get notified when an ancestor window is hidden or shown, we will keep
     // painting even when we have a hidden ancestor. <http://webkit.org/b/54104>
-    if (!lParam) {
-        m_isVisible = wParam;
-        if (m_page)
-            m_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
-    }
+    if (!lParam)
+        setIsVisible(wParam);
 
     handled = false;
     return 0;
@@ -1469,6 +1480,14 @@ void WebView::setIsInWindow(bool isInWindow)
     m_page->viewStateDidChange(WebPageProxy::ViewIsInWindow);
 }
 
+void WebView::setIsVisible(bool isVisible)
+{
+    m_isVisible = isVisible;
+
+    if (m_page)
+        m_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 
 void WebView::enterAcceleratedCompositingMode(const LayerTreeContext&)
diff --git a/Source/WebKit2/UIProcess/win/WebView.h b/Source/WebKit2/UIProcess/win/WebView.h
@@ -60,6 +60,7 @@ class WebView : public APIObject, public PageClient, WebCore::WindowMessageListe
     void setParentWindow(HWND);
     void windowAncestryDidChange();
     void setIsInWindow(bool);
+    void setIsVisible(bool);
     void setOverrideCursor(HCURSOR);
     void setInitialFocus(bool forward);
     void setScrollOffsetOnNextResize(const WebCore::IntSize&);
