Title: [209377] trunk/Source/WebKit2
Revision
209377
Author
[email protected]
Date
2016-12-05 18:43:59 -0800 (Mon, 05 Dec 2016)

Log 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:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (209376 => 209377)


--- trunk/Source/WebKit2/ChangeLog	2016-12-06 02:41:30 UTC (rev 209376)
+++ trunk/Source/WebKit2/ChangeLog	2016-12-06 02:43:59 UTC (rev 209377)
@@ -1,3 +1,18 @@
+2016-12-03  Simon Fraser  <[email protected]>
+
+        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  <[email protected]>
 
         Adopt CAMachPort-as-layer-contents

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (209376 => 209377)


--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h	2016-12-06 02:41:30 UTC (rev 209376)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h	2016-12-06 02:43:59 UTC (rev 209377)
@@ -66,7 +66,8 @@
 
 - (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
     scale:(CGFloat)scale minimumScale:(CGFloat)minimumScale

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (209376 => 209377)


--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm	2016-12-06 02:41:30 UTC (rev 209376)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm	2016-12-06 02:43:59 UTC (rev 209377)
@@ -362,8 +362,14 @@
     [_fixedClippingView setBounds:clippingBounds];
 }
 
-- (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();
     if (!drawingArea)
@@ -372,16 +378,16 @@
     MonotonicTime timestamp = MonotonicTime::now();
     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,
         WebCore::FloatSize(obscuredInset),
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to