Changeset 152266 in webkit

Timestamp:

Jul 1, 2013 2:47:51 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

[wk2] TiledCoreAnimationDrawingArea should support scrolling its exposed rect
​https://bugs.webkit.org/show_bug.cgi?id=118173
<rdar://problem/14301166>

Reviewed by Anders Carlsson.

Offset the exposed rect passed from the WKView by the main frame's current scroll position
before sending it to our TiledBackings, so that it is in the same coordinate space as their
ordinary visibleRects.

This has the side effect of making clips-to-exposed-rect testable (though useless) in Safari.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:

Add updateScrolledExposedRect() and m_scrolledExposedRect.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::scroll):
Call updateScrolledExposedRect when the main frame scrolls.

(WebKit::TiledCoreAnimationDrawingArea::setExposedRect):
Remove a FIXME about this change.
Call updateScrolledExposedRect instead of passing down the unscrolled rect.

(WebKit::TiledCoreAnimationDrawingArea::setClipsToExposedRect):
Call updateScrolledExposedRect, because that method will short-circuit if
setClipsToExposedRect is false, so we need to update here for correctness
if we get a setExposedRect(), setClipsToExposedRect(true) pair.

(WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):
Update m_scrolledExposedRect and propagate it to our TiledBackings.

(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
(WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
(WebKit::TiledCoreAnimationDrawingArea::createPageOverlayLayer):
(WebKit::TiledCoreAnimationDrawingArea::didCommitChangesForLayer):
Use the scrolled exposed rect.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (modified) (2 diffs)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-07-01  Tim Horton  <timothy_horton@apple.com>
+
+        [wk2] TiledCoreAnimationDrawingArea should support scrolling its exposed rect
+        https://bugs.webkit.org/show_bug.cgi?id=118173
+        <rdar://problem/14301166>
+
+        Reviewed by Anders Carlsson.
+
+        Offset the exposed rect passed from the WKView by the main frame's current scroll position
+        before sending it to our TiledBackings, so that it is in the same coordinate space as their
+        ordinary visibleRects.
+
+        This has the side effect of making clips-to-exposed-rect testable (though useless) in Safari.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+        Add updateScrolledExposedRect() and m_scrolledExposedRect.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::scroll):
+        Call updateScrolledExposedRect when the main frame scrolls.
+
+        (WebKit::TiledCoreAnimationDrawingArea::setExposedRect):
+        Remove a FIXME about this change.
+        Call updateScrolledExposedRect instead of passing down the unscrolled rect.
+
+        (WebKit::TiledCoreAnimationDrawingArea::setClipsToExposedRect):
+        Call updateScrolledExposedRect, because that method will short-circuit if
+        setClipsToExposedRect is false, so we need to update here for correctness
+        if we get a setExposedRect(), setClipsToExposedRect(true) pair.
+
+        (WebKit::TiledCoreAnimationDrawingArea::updateScrolledExposedRect):
+        Update m_scrolledExposedRect and propagate it to our TiledBackings.
+
+        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+        (WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
+        (WebKit::TiledCoreAnimationDrawingArea::createPageOverlayLayer):
+        (WebKit::TiledCoreAnimationDrawingArea::didCommitChangesForLayer):
+        Use the scrolled exposed rect.
+
 2013-07-01  Ada Chan  <adachan@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h

@@ -112 +112 @@
     void updateIntrinsicContentSizeTimerFired(WebCore::Timer<TiledCoreAnimationDrawingArea>*);
     void updateMainFrameClipsToExposedRect();
+    void updateScrolledExposedRect();
     
     void invalidateAllPageOverlays();
@@ -133 +134 @@
 
     WebCore::FloatRect m_exposedRect;
+    WebCore::FloatRect m_scrolledExposedRect;
     bool m_clipsToExposedRect;
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -113 +113 @@
 void TiledCoreAnimationDrawingArea::scroll(const IntRect& scrollRect, const IntSize& scrollDelta)
 {
+    updateScrolledExposedRect();
 }
 
@@ -352 +353 @@
     IntRect visibleRect = enclosingIntRect(m_rootLayer.get().frame);
     if (m_clipsToExposedRect)
-        visibleRect.intersect(enclosingIntRect(m_exposedRect));
+        visibleRect.intersect(enclosingIntRect(m_scrolledExposedRect));
 
     for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
@@ -405 +406 @@
 void TiledCoreAnimationDrawingArea::setExposedRect(const FloatRect& exposedRect)
 {
-    // FIXME: This should be mapped through the scroll offset, but we need to keep it up to date.
     m_exposedRect = exposedRect;
-
-    mainFrameTiledBacking()->setExposedRect(exposedRect);
-
-    for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it)
+    updateScrolledExposedRect();
+}
+
+void TiledCoreAnimationDrawingArea::setClipsToExposedRect(bool clipsToExposedRect)
+{
+    m_clipsToExposedRect = clipsToExposedRect;
+    updateScrolledExposedRect();
+    updateMainFrameClipsToExposedRect();
+}
+
+void TiledCoreAnimationDrawingArea::updateScrolledExposedRect()
+{
+    if (!m_clipsToExposedRect)
+        return;
+
+    Frame* frame = m_webPage->corePage()->mainFrame();
+    if (!frame)
+        return;
+
+    FrameView* frameView = frame->view();
+    if (!frameView)
+        return;
+
+    IntPoint scrollPositionWithOrigin = frameView->scrollPosition() + toIntSize(frameView->scrollOrigin());
+
+    m_scrolledExposedRect = m_exposedRect;
+    m_scrolledExposedRect.moveBy(scrollPositionWithOrigin);
+
+    mainFrameTiledBacking()->setExposedRect(m_scrolledExposedRect);
+
+    for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(), end = m_pageOverlayLayers.end(); it != end; ++it) {
         if (TiledBacking* tiledBacking = it->value->tiledBacking())
-            tiledBacking->setExposedRect(exposedRect);
-}
-
-void TiledCoreAnimationDrawingArea::setClipsToExposedRect(bool clipsToExposedRect)
-{
-    m_clipsToExposedRect = clipsToExposedRect;
-    updateMainFrameClipsToExposedRect();
+            tiledBacking->setExposedRect(m_scrolledExposedRect);
+    }
 }
 
@@ -566 +588 @@
     if (TiledBacking* tiledBacking = mainFrameTiledBacking()) {
         tiledBacking->setAggressivelyRetainsTiles(m_webPage->corePage()->settings()->aggressiveTileRetentionEnabled());
-        tiledBacking->setExposedRect(m_exposedRect);
+        tiledBacking->setExposedRect(m_scrolledExposedRect);
     }
 
@@ -590 +612 @@
 
     if (TiledBacking* tiledBacking = layer->tiledBacking()) {
-        tiledBacking->setExposedRect(m_exposedRect);
+        tiledBacking->setExposedRect(m_scrolledExposedRect);
         tiledBacking->setClipsToExposedRect(m_clipsToExposedRect);
     }
@@ -638 +660 @@
 
     if (TiledBacking* tiledBacking = layer->tiledBacking()) {
-        tiledBacking->setExposedRect(m_exposedRect);
+        tiledBacking->setExposedRect(m_scrolledExposedRect);
         tiledBacking->setClipsToExposedRect(m_clipsToExposedRect);
     }