Changeset 169064 in webkit

Timestamp:

May 19, 2014, 2:02:24 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

[iOS][WK2] Move scale noise filtering to the WebProcess
​https://bugs.webkit.org/show_bug.cgi?id=133021

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-05-19
Reviewed by Darin Adler.

Filtering in the UIProcess was stupid. It forces to handle a third kind of scale just for updates.

The WebProcess already adjusts the input scale based on the viewport. Changing the input scale at that level
is already supported. It is a better place to have the filtering.

• UIProcess/ios/WKContentView.mm:

(-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:]):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::updateVisibleContentRects):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentView.mm (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-19  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] Move scale noise filtering to the WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=133021
+
+        Reviewed by Darin Adler.
+
+        Filtering in the UIProcess was stupid. It forces to handle a third kind of scale just for updates.
+
+        The WebProcess already adjusts the input scale based on the viewport. Changing the input scale at that level
+        is already supported. It is a better place to have the filtering.
+
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:]):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::updateVisibleContentRects):
+
 2014-05-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -303 +303 @@
         _historicalKinematicData.clear();
 
-    double scaleNoiseThreshold = 0.0005;
-    CGFloat filteredScale = zoomScale;
-    if (!isStableState && fabs(filteredScale - _page->displayedContentScale()) < scaleNoiseThreshold) {
-        // Tiny changes of scale during interactive zoom cause content to jump by one pixel, creating
-        // visual noise. We filter those useless updates.
-        filteredScale = _page->displayedContentScale();
-    }
-
     FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredRect, zoomScale, WebPageProxy::UnobscuredRectConstraint::ConstrainedToDocumentRect);
     _page->updateVisibleContentRects(VisibleContentRectUpdateInfo(_page->nextVisibleContentRectUpdateID(), visibleRect, unobscuredRect, unobscuredRectInScrollViewCoordinates, fixedPositionRectForLayout,
-        filteredScale, isStableState, isChangingObscuredInsetsInteractively, timestamp, velocityData.horizontalVelocity, velocityData.verticalVelocity, velocityData.scaleChangeRate));
+        zoomScale, isStableState, isChangingObscuredInsetsInteractively, timestamp, velocityData.horizontalVelocity, velocityData.verticalVelocity, velocityData.scaleChangeRate));
 
     RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2204 +2204 @@
     m_lastVisibleContentRectUpdateID = visibleContentRectUpdateInfo.updateID();
 
-    double boundedScale = std::min(m_viewportConfiguration.maximumScale(), std::max(m_viewportConfiguration.minimumScale(), visibleContentRectUpdateInfo.scale()));
+    double scaleNoiseThreshold = 0.005;
+    double filteredScale = visibleContentRectUpdateInfo.scale();
+    double currentScale = m_page->pageScaleFactor();
+    if (!visibleContentRectUpdateInfo.inStableState() && fabs(filteredScale - m_page->pageScaleFactor()) < scaleNoiseThreshold) {
+        // Tiny changes of scale during interactive zoom cause content to jump by one pixel, creating
+        // visual noise. We filter those useless updates.
+        filteredScale = currentScale;
+    }
+
+    double boundedScale = std::min(m_viewportConfiguration.maximumScale(), std::max(m_viewportConfiguration.minimumScale(), filteredScale));
 
     FloatRect exposedRect = visibleContentRectUpdateInfo.exposedRect();
@@ -2215 +2224 @@
     float floatBoundedScale = boundedScale;
     bool hasSetPageScale = false;
-    if (floatBoundedScale != m_page->pageScaleFactor()) {
+    if (floatBoundedScale != currentScale) {
         m_scaleWasSetByUIProcess = true;