Changeset 84019 in webkit

Timestamp:

Apr 15, 2011 12:46:49 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

Views should be made visible before painting in WM_PRINTCLIENT messages
​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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/win/WebView.cpp (modified) (3 diffs)
• UIProcess/win/WebView.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/UIProcess/win/WebView.cpp

@@ -692 +692 @@
     ::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;
@@ -753 +767 @@
     // 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;
@@ -1470 +1481 @@
 }
 
+void WebView::setIsVisible(bool isVisible)
+{
+    m_isVisible = isVisible;
+
+    if (m_page)
+        m_page->viewStateDidChange(WebPageProxy::ViewIsVisible);
+}
+
 #if USE(ACCELERATED_COMPOSITING)
 

trunk/Source/WebKit2/UIProcess/win/WebView.h

@@ -61 +61 @@
     void windowAncestryDidChange();
     void setIsInWindow(bool);
+    void setIsVisible(bool);
     void setOverrideCursor(HCURSOR);
     void setInitialFocus(bool forward);