Title: [211764] trunk/Source/WebKit2
Revision
211764
Author
simon.fra...@apple.com
Date
2017-02-06 18:08:37 -0800 (Mon, 06 Feb 2017)

Log Message

[iOS WK2] Keep the tiled scrolling indicator on-screen when pinching
https://bugs.webkit.org/show_bug.cgi?id=167915

Reviewed by Tim Horton.

Clamp the location to the larger of the location of .unobscuredContentRect() and 0,0.

* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::indicatorLocation):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (211763 => 211764)


--- trunk/Source/WebKit2/ChangeLog	2017-02-07 01:48:22 UTC (rev 211763)
+++ trunk/Source/WebKit2/ChangeLog	2017-02-07 02:08:37 UTC (rev 211764)
@@ -1,5 +1,17 @@
 2017-02-06  Simon Fraser  <simon.fra...@apple.com>
 
+        [iOS WK2] Keep the tiled scrolling indicator on-screen when pinching
+        https://bugs.webkit.org/show_bug.cgi?id=167915
+
+        Reviewed by Tim Horton.
+        
+        Clamp the location to the larger of the location of .unobscuredContentRect() and 0,0.
+
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+        (WebKit::RemoteLayerTreeDrawingAreaProxy::indicatorLocation):
+
+2017-02-06  Simon Fraser  <simon.fra...@apple.com>
+
         Tiled scrolling indicator gets doubled up on navigation
         https://bugs.webkit.org/show_bug.cgi?id=167909
 

Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (211763 => 211764)


--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm	2017-02-07 01:48:22 UTC (rev 211763)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm	2017-02-07 02:08:37 UTC (rev 211764)
@@ -269,8 +269,8 @@
 {
     if (m_webPageProxy.delegatesScrolling()) {
 #if PLATFORM(IOS)
-        FloatPoint tiledMapLocation = m_webPageProxy.unobscuredContentRect().location();
-        tiledMapLocation = tiledMapLocation.expandedTo(m_webPageProxy.exposedContentRect().location() + FloatSize(0, 60));
+        FloatPoint tiledMapLocation = m_webPageProxy.unobscuredContentRect().location().expandedTo(FloatPoint());
+        tiledMapLocation = tiledMapLocation.expandedTo(m_webPageProxy.exposedContentRect().location());
 
         float absoluteInset = indicatorInset / m_webPageProxy.displayedContentScale();
         tiledMapLocation += FloatSize(absoluteInset, absoluteInset);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to