Title: [143472] trunk/Source/WebKit2
Revision
143472
Author
commit-qu...@webkit.org
Date
2013-02-20 10:10:22 -0800 (Wed, 20 Feb 2013)

Log Message

[WK2] add setNeedsDisplay in DrawingArea to mark whole layer as dirty.
https://bugs.webkit.org/show_bug.cgi?id=110299

Patch by Huang Dongsung <luxte...@company100.net> on 2013-02-20
Reviewed by Anders Carlsson.

Currently, we call setNeedsDisplay with the size of WebPage to mark whole
backing store as dirty. However, the size of non compositing layer can be
inconsistent with the size of WebPage. For example, in Coordinated Graphics, the
size of non compositing layer is contents size.

So, WebPage should not assume the size of non compositing layer, and should just
call setNeedsDisplay when marking whole layer as dirty.

In addition, this patch renames from setNeedsDisplay() with a rect argument to
setNeedsDisplayInRect(), which matches to the terms of GraphicsLayer.

* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::invalidateContentsAndRootView):
(WebKit::WebChromeClient::invalidateContentsForSlowScroll):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::restoreViewState):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplay):
(WebKit):
(WebKit::CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplayInRect):
(WebKit::CoordinatedLayerTreeHost::scrollNonCompositedContents):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
(CoordinatedLayerTreeHost):
* WebProcess/WebPage/DrawingArea.h:
(DrawingArea):
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::setNeedsDisplay):
(WebKit):
(WebKit::DrawingAreaImpl::setNeedsDisplayInRect):
(WebKit::DrawingAreaImpl::scroll):
(WebKit::DrawingAreaImpl::forceRepaint):
(WebKit::DrawingAreaImpl::didUninstallPageOverlay):
(WebKit::DrawingAreaImpl::setPageOverlayNeedsDisplay):
(WebKit::DrawingAreaImpl::resumePainting):
* WebProcess/WebPage/DrawingAreaImpl.h:
(DrawingAreaImpl):
* WebProcess/WebPage/LayerTreeHost.h:
(LayerTreeHost):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setSize):
(WebKit::WebPage::setDrawsBackground):
(WebKit::WebPage::setDrawsTransparentBackground):
(WebKit::WebPage::resumeActiveDOMObjectsAndAnimations):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplay):
(WebKit):
(WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect):
(WebKit::LayerTreeHostGtk::scrollNonCompositedContents):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
(LayerTreeHostGtk):
* WebProcess/WebPage/mac/LayerTreeHostMac.h:
(LayerTreeHostMac):
* WebProcess/WebPage/mac/LayerTreeHostMac.mm:
(WebKit::LayerTreeHostMac::setNonCompositedContentsNeedDisplay):
(WebKit):
(WebKit::LayerTreeHostMac::setNonCompositedContentsNeedDisplayInRect):
(WebKit::LayerTreeHostMac::scrollNonCompositedContents):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
(RemoteLayerTreeDrawingArea):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::setNeedsDisplay):
(WebKit):
(WebKit::RemoteLayerTreeDrawingArea::setNeedsDisplayInRect):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
(TiledCoreAnimationDrawingArea):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::setNeedsDisplay):
(WebKit):
(WebKit::TiledCoreAnimationDrawingArea::setNeedsDisplayInRect):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (143471 => 143472)


--- trunk/Source/WebKit2/ChangeLog	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-20 18:10:22 UTC (rev 143472)
@@ -1,3 +1,80 @@
+2013-02-20  Huang Dongsung  <luxte...@company100.net>
+
+        [WK2] add setNeedsDisplay in DrawingArea to mark whole layer as dirty.
+        https://bugs.webkit.org/show_bug.cgi?id=110299
+
+        Reviewed by Anders Carlsson.
+
+        Currently, we call setNeedsDisplay with the size of WebPage to mark whole
+        backing store as dirty. However, the size of non compositing layer can be
+        inconsistent with the size of WebPage. For example, in Coordinated Graphics, the
+        size of non compositing layer is contents size.
+
+        So, WebPage should not assume the size of non compositing layer, and should just
+        call setNeedsDisplay when marking whole layer as dirty.
+
+        In addition, this patch renames from setNeedsDisplay() with a rect argument to
+        setNeedsDisplayInRect(), which matches to the terms of GraphicsLayer.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::invalidateContentsAndRootView):
+        (WebKit::WebChromeClient::invalidateContentsForSlowScroll):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::restoreViewState):
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        (WebKit::CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplay):
+        (WebKit):
+        (WebKit::CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplayInRect):
+        (WebKit::CoordinatedLayerTreeHost::scrollNonCompositedContents):
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+        (CoordinatedLayerTreeHost):
+        * WebProcess/WebPage/DrawingArea.h:
+        (DrawingArea):
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::setNeedsDisplay):
+        (WebKit):
+        (WebKit::DrawingAreaImpl::setNeedsDisplayInRect):
+        (WebKit::DrawingAreaImpl::scroll):
+        (WebKit::DrawingAreaImpl::forceRepaint):
+        (WebKit::DrawingAreaImpl::didUninstallPageOverlay):
+        (WebKit::DrawingAreaImpl::setPageOverlayNeedsDisplay):
+        (WebKit::DrawingAreaImpl::resumePainting):
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        (DrawingAreaImpl):
+        * WebProcess/WebPage/LayerTreeHost.h:
+        (LayerTreeHost):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setSize):
+        (WebKit::WebPage::setDrawsBackground):
+        (WebKit::WebPage::setDrawsTransparentBackground):
+        (WebKit::WebPage::resumeActiveDOMObjectsAndAnimations):
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+        (WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplay):
+        (WebKit):
+        (WebKit::LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect):
+        (WebKit::LayerTreeHostGtk::scrollNonCompositedContents):
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+        (LayerTreeHostGtk):
+        * WebProcess/WebPage/mac/LayerTreeHostMac.h:
+        (LayerTreeHostMac):
+        * WebProcess/WebPage/mac/LayerTreeHostMac.mm:
+        (WebKit::LayerTreeHostMac::setNonCompositedContentsNeedDisplay):
+        (WebKit):
+        (WebKit::LayerTreeHostMac::setNonCompositedContentsNeedDisplayInRect):
+        (WebKit::LayerTreeHostMac::scrollNonCompositedContents):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        (RemoteLayerTreeDrawingArea):
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::setNeedsDisplay):
+        (WebKit):
+        (WebKit::RemoteLayerTreeDrawingArea::setNeedsDisplayInRect):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+        (TiledCoreAnimationDrawingArea):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::setNeedsDisplay):
+        (WebKit):
+        (WebKit::TiledCoreAnimationDrawingArea::setNeedsDisplayInRect):
+
 2013-02-20  Christophe Dumez  <ch.du...@sisa.samsung.com>
 
         [EFL][WK2] Port EwkPopupMenuItem to the C API

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp	2013-02-20 18:10:22 UTC (rev 143472)
@@ -390,7 +390,7 @@
             return;
     }
 
-    m_page->drawingArea()->setNeedsDisplay(rect);
+    m_page->drawingArea()->setNeedsDisplayInRect(rect);
 }
 
 void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool)
@@ -401,7 +401,7 @@
     }
 
     m_page->pageDidScroll();
-    m_page->drawingArea()->setNeedsDisplay(rect);
+    m_page->drawingArea()->setNeedsDisplayInRect(rect);
 }
 
 void WebChromeClient::scroll(const IntSize& scrollDelta, const IntRect& scrollRect, const IntRect& clipRect)

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2013-02-20 18:10:22 UTC (rev 143472)
@@ -1129,7 +1129,7 @@
     // FIXME: This should not be necessary. WebCore should be correctly invalidating
     // the view on restores from the back/forward cache.
     if (m_frame == m_frame->page()->mainWebFrame())
-        m_frame->page()->drawingArea()->setNeedsDisplay(m_frame->page()->bounds());
+        m_frame->page()->drawingArea()->setNeedsDisplay();
 }
 
 void WebFrameLoaderClient::provisionalLoadStarted()

Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp	2013-02-20 18:10:22 UTC (rev 143472)
@@ -177,8 +177,17 @@
     m_isValid = false;
 }
 
-void CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplay(const WebCore::IntRect& rect)
+void CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplay()
 {
+    m_nonCompositedContentLayer->setNeedsDisplay();
+    if (m_pageOverlayLayer)
+        m_pageOverlayLayer->setNeedsDisplay();
+
+    scheduleLayerFlush();
+}
+
+void CoordinatedLayerTreeHost::setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect& rect)
+{
     m_nonCompositedContentLayer->setNeedsDisplayInRect(rect);
     if (m_pageOverlayLayer)
         m_pageOverlayLayer->setNeedsDisplayInRect(rect);
@@ -188,7 +197,7 @@
 
 void CoordinatedLayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect& scrollRect)
 {
-    setNonCompositedContentsNeedDisplay(scrollRect);
+    setNonCompositedContentsNeedDisplayInRect(scrollRect);
 }
 
 void CoordinatedLayerTreeHost::forceRepaint()

Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -64,7 +64,8 @@
     virtual void setRootCompositingLayer(WebCore::GraphicsLayer*);
     virtual void invalidate();
 
-    virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&);
+    virtual void setNonCompositedContentsNeedDisplay() OVERRIDE;
+    virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) OVERRIDE;
     virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect);
     virtual void forceRepaint();
     virtual bool forceRepaintAsync(uint64_t callbackID);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -60,7 +60,8 @@
     
     void didReceiveDrawingAreaMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
 
-    virtual void setNeedsDisplay(const WebCore::IntRect&) = 0;
+    virtual void setNeedsDisplay() = 0;
+    virtual void setNeedsDisplayInRect(const WebCore::IntRect&) = 0;
     virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta) = 0;
 
     // FIXME: These should be pure virtual.

Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp	2013-02-20 18:10:22 UTC (rev 143472)
@@ -80,24 +80,37 @@
         enterAcceleratedCompositingMode(0);
 }
 
-void DrawingAreaImpl::setNeedsDisplay(const IntRect& rect)
+void DrawingAreaImpl::setNeedsDisplay()
 {
     if (!m_isPaintingEnabled)
         return;
 
-    IntRect dirtyRect = rect;
-    dirtyRect.intersect(m_webPage->bounds());
+    if (m_layerTreeHost) {
+        ASSERT(m_dirtyRegion.isEmpty());
+        m_layerTreeHost->setNonCompositedContentsNeedDisplay();
+        return;
+    }
 
-    if (dirtyRect.isEmpty())
+    setNeedsDisplayInRect(m_webPage->bounds());
+}
+
+void DrawingAreaImpl::setNeedsDisplayInRect(const IntRect& rect)
+{
+    if (!m_isPaintingEnabled)
         return;
 
     if (m_layerTreeHost) {
         ASSERT(m_dirtyRegion.isEmpty());
-
-        m_layerTreeHost->setNonCompositedContentsNeedDisplay(dirtyRect);
+        m_layerTreeHost->setNonCompositedContentsNeedDisplayInRect(rect);
         return;
     }
     
+    IntRect dirtyRect = rect;
+    dirtyRect.intersect(m_webPage->bounds());
+
+    if (dirtyRect.isEmpty())
+        return;
+
     if (m_webPage->mainFrameHasCustomRepresentation())
         return;
 
@@ -132,12 +145,12 @@
         if (currentScrollArea >= scrollArea) {
             // The rect being scrolled is at least as large as the rect we'd like to scroll.
             // Go ahead and just invalidate the scroll rect.
-            setNeedsDisplay(scrollRect);
+            setNeedsDisplayInRect(scrollRect);
             return;
         }
 
         // Just repaint the entire current scroll rect, we'll scroll the new rect instead.
-        setNeedsDisplay(m_scrollRect);
+        setNeedsDisplayInRect(m_scrollRect);
         m_scrollRect = IntRect();
         m_scrollOffset = IntSize();
     }
@@ -184,7 +197,7 @@
 
 void DrawingAreaImpl::forceRepaint()
 {
-    setNeedsDisplay(m_webPage->bounds());
+    setNeedsDisplay();
 
     m_webPage->layoutIfNeeded();
 
@@ -223,7 +236,7 @@
     if (m_layerTreeHost)
         m_layerTreeHost->didUninstallPageOverlay();
 
-    setNeedsDisplay(m_webPage->bounds());
+    setNeedsDisplay();
 }
 
 void DrawingAreaImpl::setPageOverlayNeedsDisplay(const IntRect& rect)
@@ -233,7 +246,7 @@
         return;
     }
 
-    setNeedsDisplay(rect);
+    setNeedsDisplayInRect(rect);
 }
 
 void DrawingAreaImpl::setPageOverlayOpacity(float value)
@@ -488,7 +501,7 @@
     m_isPaintingSuspended = false;
 
     // FIXME: We shouldn't always repaint everything here.
-    setNeedsDisplay(m_webPage->bounds());
+    setNeedsDisplay();
 
 #if PLATFORM(MAC)
     if (m_webPage->windowIsVisible())

Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -51,7 +51,8 @@
     DrawingAreaImpl(WebPage*, const WebPageCreationParameters&);
 
     // DrawingArea
-    virtual void setNeedsDisplay(const WebCore::IntRect&);
+    virtual void setNeedsDisplay() OVERRIDE;
+    virtual void setNeedsDisplayInRect(const WebCore::IntRect&) OVERRIDE;
     virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta);
     virtual void setLayerTreeStateIsFrozen(bool);
     virtual bool layerTreeStateIsFrozen() const { return m_layerTreeStateIsFrozen; }

Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -64,7 +64,8 @@
     virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) = 0;
     virtual void invalidate() = 0;
 
-    virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&) = 0;
+    virtual void setNonCompositedContentsNeedDisplay() = 0;
+    virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) = 0;
     virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) = 0;
     virtual void forceRepaint() = 0;
     virtual bool forceRepaintAsync(uint64_t /*callbackID*/) { return false; }

Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp	2013-02-20 18:10:22 UTC (rev 143472)
@@ -990,7 +990,7 @@
 
     view->resize(viewSize);
     view->setNeedsLayout();
-    m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), viewSize));
+    m_drawingArea->setNeedsDisplay();
     
     m_viewSize = viewSize;
 }
@@ -1879,7 +1879,7 @@
     }
 
     m_drawingArea->pageBackgroundTransparencyChanged();
-    m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
+    m_drawingArea->setNeedsDisplay();
 }
 
 void WebPage::setDrawsTransparentBackground(bool drawsTransparentBackground)
@@ -1896,7 +1896,7 @@
     }
 
     m_drawingArea->pageBackgroundTransparencyChanged();
-    m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
+    m_drawingArea->setNeedsDisplay();
 }
 
 void WebPage::viewWillStartLiveResize()
@@ -2038,7 +2038,7 @@
     m_page->resumeActiveDOMObjectsAndAnimations();
 
     // We need to repaint on resume to kickstart animated painting again.
-    m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
+    m_drawingArea->setNeedsDisplay();
 }
 
 IntPoint WebPage::screenToWindow(const IntPoint& point)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp	2013-02-20 18:10:22 UTC (rev 143472)
@@ -168,8 +168,17 @@
     m_isValid = false;
 }
 
-void LayerTreeHostGtk::setNonCompositedContentsNeedDisplay(const IntRect& rect)
+void LayerTreeHostGtk::setNonCompositedContentsNeedDisplay()
 {
+    m_nonCompositedContentLayer->setNeedsDisplay();
+    if (m_pageOverlayLayer)
+        m_pageOverlayLayer->setNeedsDisplay();
+
+    scheduleLayerFlush();
+}
+
+void LayerTreeHostGtk::setNonCompositedContentsNeedDisplayInRect(const IntRect& rect)
+{
     m_nonCompositedContentLayer->setNeedsDisplayInRect(rect);
     if (m_pageOverlayLayer)
         m_pageOverlayLayer->setNeedsDisplayInRect(rect);
@@ -179,7 +188,7 @@
 
 void LayerTreeHostGtk::scrollNonCompositedContents(const IntRect& scrollRect)
 {
-    setNonCompositedContentsNeedDisplay(scrollRect);
+    setNonCompositedContentsNeedDisplayInRect(scrollRect);
 }
 
 void LayerTreeHostGtk::sizeDidChange(const IntSize& newSize)

Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -64,7 +64,8 @@
     virtual const LayerTreeContext& layerTreeContext();
     virtual void setShouldNotifyAfterNextScheduledLayerFlush(bool);
 
-    virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&);
+    virtual void setNonCompositedContentsNeedDisplay() OVERRIDE;
+    virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) OVERRIDE;
     virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect);
 
     virtual void didInstallPageOverlay();

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -50,7 +50,8 @@
     virtual void setShouldNotifyAfterNextScheduledLayerFlush(bool) OVERRIDE;
     virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) OVERRIDE;
     virtual void invalidate() OVERRIDE;
-    virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&) OVERRIDE;
+    virtual void setNonCompositedContentsNeedDisplay() OVERRIDE;
+    virtual void setNonCompositedContentsNeedDisplayInRect(const WebCore::IntRect&) OVERRIDE;
     virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect) OVERRIDE;
     virtual void forceRepaint() OVERRIDE;
     virtual void sizeDidChange(const WebCore::IntSize& newSize) OVERRIDE;

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm	2013-02-20 18:10:22 UTC (rev 143472)
@@ -112,8 +112,17 @@
     m_layerFlushScheduler.invalidate();
 }
 
-void LayerTreeHostMac::setNonCompositedContentsNeedDisplay(const IntRect& rect)
+void LayerTreeHostMac::setNonCompositedContentsNeedDisplay()
 {
+    m_nonCompositedContentLayer->setNeedsDisplay();
+    if (m_pageOverlayLayer)
+        m_pageOverlayLayer->setNeedsDisplay();
+
+    scheduleLayerFlush();
+}
+
+void LayerTreeHostMac::setNonCompositedContentsNeedDisplayInRect(const IntRect& rect)
+{
     m_nonCompositedContentLayer->setNeedsDisplayInRect(rect);
     if (m_pageOverlayLayer)
         m_pageOverlayLayer->setNeedsDisplayInRect(rect);
@@ -123,7 +132,7 @@
 
 void LayerTreeHostMac::scrollNonCompositedContents(const IntRect& scrollRect)
 {
-    setNonCompositedContentsNeedDisplay(scrollRect);
+    setNonCompositedContentsNeedDisplayInRect(scrollRect);
 }
 
 void LayerTreeHostMac::forceRepaint()

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -42,7 +42,8 @@
     RemoteLayerTreeDrawingArea(WebPage*, const WebPageCreationParameters&);
 
     // DrawingArea
-    virtual void setNeedsDisplay(const WebCore::IntRect&) OVERRIDE;
+    virtual void setNeedsDisplay() OVERRIDE;
+    virtual void setNeedsDisplayInRect(const WebCore::IntRect&) OVERRIDE;
     virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta) OVERRIDE;
 
     virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() OVERRIDE;

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm	2013-02-20 18:10:22 UTC (rev 143472)
@@ -47,10 +47,14 @@
 {
 }
 
-void RemoteLayerTreeDrawingArea::setNeedsDisplay(const IntRect&)
+void RemoteLayerTreeDrawingArea::setNeedsDisplay()
 {
 }
 
+void RemoteLayerTreeDrawingArea::setNeedsDisplayInRect(const IntRect&)
+{
+}
+
 void RemoteLayerTreeDrawingArea::scroll(const IntRect& scrollRect, const IntSize& scrollDelta)
 {
 }

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h	2013-02-20 18:10:22 UTC (rev 143472)
@@ -55,7 +55,8 @@
     TiledCoreAnimationDrawingArea(WebPage*, const WebPageCreationParameters&);
 
     // DrawingArea
-    virtual void setNeedsDisplay(const WebCore::IntRect&) OVERRIDE;
+    virtual void setNeedsDisplay() OVERRIDE;
+    virtual void setNeedsDisplayInRect(const WebCore::IntRect&) OVERRIDE;
     virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollDelta) OVERRIDE;
 
     virtual void forceRepaint() OVERRIDE;

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (143471 => 143472)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm	2013-02-20 17:56:55 UTC (rev 143471)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm	2013-02-20 18:10:22 UTC (rev 143472)
@@ -100,10 +100,14 @@
     m_layerFlushScheduler.invalidate();
 }
 
-void TiledCoreAnimationDrawingArea::setNeedsDisplay(const IntRect& rect)
+void TiledCoreAnimationDrawingArea::setNeedsDisplay()
 {
 }
 
+void TiledCoreAnimationDrawingArea::setNeedsDisplayInRect(const IntRect& rect)
+{
+}
+
 void TiledCoreAnimationDrawingArea::scroll(const IntRect& scrollRect, const IntSize& scrollDelta)
 {
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to