Changeset 243381 in webkit

Timestamp:

Mar 22, 2019, 9:38:57 AM (7 years ago)

Author:

Simon Fraser

Message:

REGRESSION (r242687): Flicker when pinch-zooming pages in macOS Safari
​https://bugs.webkit.org/show_bug.cgi?id=196126
rdar://problem/49095791

Reviewed by Antti Koivisto.

The scrolling tree doesn't have an accurate picture of the main view's scroll position
during pinch-zooming, so don't have it apply layer positions if a transient zoom is
in progress.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
(WebKit::TiledCoreAnimationDrawingArea::applyTransientZoomToPage):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-22  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (r242687): Flicker when pinch-zooming pages in macOS Safari
+        https://bugs.webkit.org/show_bug.cgi?id=196126
+        rdar://problem/49095791
+
+        Reviewed by Antti Koivisto.
+
+        The scrolling tree doesn't have an accurate picture of the main view's scroll position
+        during pinch-zooming, so don't have it apply layer positions if a transient zoom is
+        in progress.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+        (WebKit::TiledCoreAnimationDrawingArea::applyTransientZoomToPage):
+
 2019-03-22  Antti Koivisto  <antti@apple.com>
 

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

@@ -89 +89 @@
     bool dispatchDidReachLayoutMilestone(OptionSet<WebCore::LayoutMilestone>) override;
 
-    void flushLayers();
+    enum class FlushType { Normal, TransientZoom };
+    void flushLayers(FlushType = FlushType::Normal);
 
     // Message handlers.

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

@@ -452 +452 @@
 }
 
-void TiledCoreAnimationDrawingArea::flushLayers()
+void TiledCoreAnimationDrawingArea::flushLayers(FlushType flushType)
 {
     if (layerTreeStateIsFrozen())
@@ -494 +494 @@
         if (auto* scrollingCoordinator = m_webPage.corePage()->scrollingCoordinator()) {
             scrollingCoordinator->commitTreeStateIfNeeded();
-            scrollingCoordinator->applyScrollingTreeLayerPositions();
+            if (flushType == FlushType::TransientZoom)
+                scrollingCoordinator->applyScrollingTreeLayerPositions();
         }
 #endif
@@ -924 +925 @@
     m_webPage.scalePage(scale / m_webPage.viewScaleFactor(), roundedIntPoint(-unscrolledOrigin));
     m_transientZoomScale = 1;
-    flushLayers();
+    flushLayers(FlushType::TransientZoom);
 }