Changeset 75267 in webkit

Timestamp:

Jan 7, 2011 1:19:58 PM (13 years ago)

Author:

Adam Roben

Message:

Fill the WKView with white when the web process hasn't drawn anything yet

Fixes <​http://webkit.org/b/52023> WKView accumulates pixel garbage
before web process has had a chance to draw anything (if Aero is
disabled)

Reviewed by Jon Honeycutt.

• UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:

(WebKit::ChunkedUpdateDrawingAreaProxy::paint):

• UIProcess/ChunkedUpdateDrawingAreaProxy.h:
• UIProcess/DrawingAreaProxy.h:
• UIProcess/LayerBackedDrawingAreaProxy.cpp:

(WebKit::LayerBackedDrawingAreaProxy::paint):

• UIProcess/LayerBackedDrawingAreaProxy.h:
• UIProcess/TiledDrawingAreaProxy.cpp:

(WebKit::TiledDrawingAreaProxy::paint):

• UIProcess/TiledDrawingAreaProxy.h:
• UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:

(WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):

• UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp:

(WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):

• UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp:

(WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):

• UIProcess/win/LayerBackedDrawingAreaProxyWin.cpp:

(WebKit::LayerBackedDrawingAreaProxy::paint):
Changed these functions to return a boolean indicating whether we
actually painted anything.

• UIProcess/win/WebView.cpp:

(WebKit::WebView::onPaintEvent): Fill with white (and don't call
didDraw) when the DrawingAreaProxy isn't able to paint.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ChunkedUpdateDrawingAreaProxy.cpp (modified) (2 diffs)
• UIProcess/ChunkedUpdateDrawingAreaProxy.h (modified) (2 diffs)
• UIProcess/DrawingAreaProxy.h (modified) (1 diff)
• UIProcess/LayerBackedDrawingAreaProxy.cpp (modified) (1 diff)
• UIProcess/LayerBackedDrawingAreaProxy.h (modified) (1 diff)
• UIProcess/TiledDrawingAreaProxy.cpp (modified) (2 diffs)
• UIProcess/TiledDrawingAreaProxy.h (modified) (1 diff)
• UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm (modified) (2 diffs)
• UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp (modified) (1 diff)
• UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp (modified) (1 diff)
• UIProcess/win/LayerBackedDrawingAreaProxyWin.cpp (modified) (1 diff)
• UIProcess/win/WebView.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2011-01-06  Adam Roben  <aroben@apple.com>
+
+        Fill the WKView with white when the web process hasn't drawn anything
+        yet
+
+        Fixes <http://webkit.org/b/52023> WKView accumulates pixel garbage
+        before web process has had a chance to draw anything (if Aero is
+        disabled)
+
+        Reviewed by Jon Honeycutt.
+
+        * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::paint):
+        * UIProcess/ChunkedUpdateDrawingAreaProxy.h:
+        * UIProcess/DrawingAreaProxy.h:
+        * UIProcess/LayerBackedDrawingAreaProxy.cpp:
+        (WebKit::LayerBackedDrawingAreaProxy::paint):
+        * UIProcess/LayerBackedDrawingAreaProxy.h:
+        * UIProcess/TiledDrawingAreaProxy.cpp:
+        (WebKit::TiledDrawingAreaProxy::paint):
+        * UIProcess/TiledDrawingAreaProxy.h:
+        * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
+        * UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
+        * UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp:
+        (WebKit::ChunkedUpdateDrawingAreaProxy::platformPaint):
+        * UIProcess/win/LayerBackedDrawingAreaProxyWin.cpp:
+        (WebKit::LayerBackedDrawingAreaProxy::paint):
+        Changed these functions to return a boolean indicating whether we
+        actually painted anything.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::onPaintEvent): Fill with white (and don't call
+        didDraw) when the DrawingAreaProxy isn't able to paint.
+
 2011-01-06  Jessie Berlin  <jberlin@apple.com>
 

trunk/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp

@@ -56 +56 @@
 }
 
-void ChunkedUpdateDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
+bool ChunkedUpdateDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
 {
     if (m_isWaitingForDidSetFrameNotification) {
         WebPageProxy* page = this->page();
         if (!page->isValid())
-            return;
+            return false;
         
         if (page->process()->isLaunching())
-            return;
+            return false;
 
         OwnPtr<CoreIPC::ArgumentDecoder> arguments = page->process()->connection()->waitFor(DrawingAreaProxyLegacyMessage::DidSetSize, page->pageID(), 0.04);
@@ -71 +71 @@
     }
 
-    platformPaint(rect, context);
+    return platformPaint(rect, context);
 }
 

trunk/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h

@@ -69 +69 @@
     // DrawingAreaProxy
     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
-    virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
+    virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext);
     virtual void sizeDidChange();
     virtual void setPageIsVisible(bool isVisible);
@@ -75 +75 @@
     void ensureBackingStore();
     void invalidateBackingStore();
-    void platformPaint(const WebCore::IntRect&, PlatformDrawingContext);
+    bool platformPaint(const WebCore::IntRect&, PlatformDrawingContext);
     void drawUpdateChunkIntoBackingStore(UpdateChunk*);
     void didSetSize(UpdateChunk*);

trunk/WebKit2/UIProcess/DrawingAreaProxy.h

@@ -57 +57 @@
     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*) { ASSERT_NOT_REACHED(); }
 
-    virtual void paint(const WebCore::IntRect&, PlatformDrawingContext) = 0;
+    // Returns true if painting was successful, false otherwise.
+    virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext) = 0;
+
     virtual void sizeDidChange() = 0;
     virtual void setPageIsVisible(bool isVisible) = 0;

trunk/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp

@@ -57 +57 @@
 
 #if !PLATFORM(WIN)
-void LayerBackedDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
+bool LayerBackedDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
 {
+    return true;
 }
 #endif

trunk/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h

@@ -68 +68 @@
     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
 
-    virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
+    virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext);
     virtual void sizeDidChange();
     virtual void setPageIsVisible(bool isVisible);

trunk/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp

@@ -316 +316 @@
 }
 
-void TiledDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
+bool TiledDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingContext context)
 {
     if (m_isWaitingForDidSetFrameNotification) {
         WebPageProxy* page = this->page();
         if (!page->isValid())
-            return;
+            return false;
 
         if (page->process()->isLaunching())
-            return;
+            return false;
     }
 
@@ -349 +349 @@
         }
     }
+
     gc.restore();
+    return true;
 }
 

trunk/WebKit2/UIProcess/TiledDrawingAreaProxy.h

@@ -116 +116 @@
     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
     virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder&);
-    virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
+    virtual bool paint(const WebCore::IntRect&, PlatformDrawingContext);
     virtual void sizeDidChange();
     virtual void setPageIsVisible(bool isVisible);

trunk/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm

@@ -61 +61 @@
 }
 
-void ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, CGContextRef context)
+bool ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, CGContextRef context)
 {
     if (!m_bitmapContext)
-        return;
+        return false;
 
     CGContextSaveGState(context);
@@ -80 +80 @@
 
     CGContextRestoreGState(context);
+    return true;
 }
 

trunk/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp

@@ -57 +57 @@
 }
 
-void ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, QPainter* painter)
+bool ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, QPainter* painter)
 {
     if (m_backingStoreImage.isNull())
-        return;
+        return false;
 
     painter->drawImage(QPoint(0, 0), m_backingStoreImage);
+    return true;
 }
 

trunk/WebKit2/UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp

@@ -65 +65 @@
 }
 
-void ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, HDC hdc)
+bool ChunkedUpdateDrawingAreaProxy::platformPaint(const IntRect& rect, HDC hdc)
 {
     if (!m_backingStoreBitmap)
-        return;
+        return false;
 
     // BitBlt from the backing-store to the passed in hdc.
     ::BitBlt(hdc, rect.x(), rect.y(), rect.width(), rect.height(), m_backingStoreDC.get(), rect.x(), rect.y(), SRCCOPY);
+    return true;
 }
 

trunk/WebKit2/UIProcess/win/LayerBackedDrawingAreaProxyWin.cpp

@@ -56 +56 @@
 }
 
-void LayerBackedDrawingAreaProxy::paint(const IntRect&, PlatformDrawingContext)
+bool LayerBackedDrawingAreaProxy::paint(const IntRect&, PlatformDrawingContext)
 {
+    return false;
 }
 

trunk/WebKit2/UIProcess/win/WebView.cpp

@@ -388 +388 @@
     HDC hdc = ::BeginPaint(m_window, &paintStruct);
 
-    if (m_page->isValid() && m_page->drawingArea()) {
-        m_page->drawingArea()->paint(IntRect(paintStruct.rcPaint), hdc);
+    if (m_page->isValid() && m_page->drawingArea() && m_page->drawingArea()->paint(IntRect(paintStruct.rcPaint), hdc))
         m_page->didDraw();
-    } else {
+    else {
         // Mac checks WebPageProxy::drawsBackground and
         // WebPageProxy::drawsTransparentBackground here, but those are always false on Windows