Changeset 219314 in webkit

Timestamp:

Jul 10, 2017 4:28:27 PM (7 years ago)

Author:

Chris Dumez

Message:

[iOS] _didCommitLayerTree should avoid calling [scrollView setZoomScale] unnecessarily
​https://bugs.webkit.org/show_bug.cgi?id=174326
<rdar://problem/33150490>

Reviewed by Simon Fraser.

Only call [scrollView setZoomScale] if the new zoom scale is actually different to
avoid doing unnecessary work in UIKit.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _didCommitLayerTree:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-10  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] _didCommitLayerTree should avoid calling [scrollView setZoomScale] unnecessarily
+        https://bugs.webkit.org/show_bug.cgi?id=174326
+        <rdar://problem/33150490>
+
+        Reviewed by Simon Fraser.
+
+        Only call [scrollView setZoomScale] if the new zoom scale is actually different to
+        avoid doing unnecessary work in UIKit.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _didCommitLayerTree:]):
+
 2017-07-10  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1510 +1510 @@
     [_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
     [_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
-    if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom])
+    if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom] && [_scrollView zoomScale] != layerTreeTransaction.pageScaleFactor())
         [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];