Changeset 209377 in webkit

Timestamp:

Dec 5, 2016 6:43:59 PM (7 years ago)

Author:

Simon Fraser

Message:

Minor reformat and renames in -didUpdateVisibleRect:
​https://bugs.webkit.org/show_bug.cgi?id=165365

Reviewed by Dave Hyatt.

didUpdateVisibleRect:... has lots of parameters. Put one on each line.

Rename the rects to make it clear they are "content" rects (i.e. in document coordinates).

• UIProcess/ios/WKContentView.h:
• UIProcess/ios/WKContentView.mm:

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentView.h (modified) (1 diff)
• UIProcess/ios/WKContentView.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-12-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Minor reformat and renames in -didUpdateVisibleRect:
+        https://bugs.webkit.org/show_bug.cgi?id=165365
+
+        Reviewed by Dave Hyatt.
+        
+        didUpdateVisibleRect:... has lots of parameters. Put one on each line.
+
+        Rename the rects to make it clear they are "content" rects (i.e. in document coordinates).
+
+        * UIProcess/ios/WKContentView.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):
+
 2016-12-05  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -67 +67 @@
 - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
 
-- (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect
+- (void)didUpdateVisibleRect:(CGRect)visibleRect
+    unobscuredRect:(CGRect)unobscuredRect
     unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
     obscuredInset:(CGSize)topInset

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

@@ -363 +363 @@
 }
 
-- (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
-    obscuredInset:(CGSize)obscuredInset scale:(CGFloat)zoomScale minimumScale:(CGFloat)minimumScale inStableState:(BOOL)isStableState isChangingObscuredInsetsInteractively:(BOOL)isChangingObscuredInsetsInteractively enclosedInScrollableAncestorView:(BOOL)enclosedInScrollableAncestorView
+- (void)didUpdateVisibleRect:(CGRect)visibleContentRect
+    unobscuredRect:(CGRect)unobscuredContentRect
+    unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
+    obscuredInset:(CGSize)obscuredInset
+    scale:(CGFloat)zoomScale minimumScale:(CGFloat)minimumScale
+    inStableState:(BOOL)isStableState
+    isChangingObscuredInsetsInteractively:(BOOL)isChangingObscuredInsetsInteractively
+    enclosedInScrollableAncestorView:(BOOL)enclosedInScrollableAncestorView
 {
     auto drawingArea = _page->drawingArea();
@@ -373 +379 @@
     HistoricalVelocityData::VelocityData velocityData;
     if (!isStableState)
-        velocityData = _historicalKinematicData.velocityForNewData(visibleRect.origin, zoomScale, timestamp);
+        velocityData = _historicalKinematicData.velocityForNewData(visibleContentRect.origin, zoomScale, timestamp);
     else
         _historicalKinematicData.clear();
 
     RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();
-    FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredRect, _page->customFixedPositionRect(), zoomScale, WebPageProxy::UnobscuredRectConstraint::ConstrainedToDocumentRect, scrollingCoordinator->visualViewportEnabled());
+    FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredContentRect, _page->customFixedPositionRect(), zoomScale, WebPageProxy::UnobscuredRectConstraint::ConstrainedToDocumentRect, scrollingCoordinator->visualViewportEnabled());
 
     VisibleContentRectUpdateInfo visibleContentRectUpdateInfo(
-        visibleRect,
-        unobscuredRect,
+        visibleContentRect,
+        unobscuredContentRect,
         unobscuredRectInScrollViewCoordinates,
         fixedPositionRectForLayout,