Changeset 209447 in webkit

Timestamp:

Dec 6, 2016, 9:14:28 PM (9 years ago)

Author:

Simon Fraser

Message:

Two tiled drawing tests failing with visual viewports enabled.
​https://bugs.webkit.org/show_bug.cgi?id=165489

Reviewed by Dean Jackson.
Source/WebCore:

computeLayoutViewportOrigin() gets called for iframes when the layout viewport
is zero-sized, but the visual viewport is non-zero. It doesn't really make sense
to compute a layout viewport when the visual viewport is larger than the layout
viewport, but if this happens just anchor the layout viewport at the origin
of the visual viewport.

• page/FrameView.cpp:

(WebCore::FrameView::computeLayoutViewportOrigin):

LayoutTests:

Unfail and rebaseline.

• platform/mac-wk2/TestExpectations:
• tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
• tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt (modified) (1 diff)
• LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Two tiled drawing tests failing with visual viewports enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=165489
+
+        Reviewed by Dean Jackson.
+        
+        Unfail and rebaseline.
+
+        * platform/mac-wk2/TestExpectations:
+        * tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
+        * tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:
+
 2016-12-06  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -268 +268 @@
 webkit.org/b/148407 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html [ Pass Failure ]
 webkit.org/b/165196 tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html [ Pass Failure ]
-webkit.org/b/165489 tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor.html [ Pass Failure ]
-webkit.org/b/165489 tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor.html [ Pass Failure ]
 
 webkit.org/b/148408 tiled-drawing/scrolling/root-overflow-with-mousewheel.html [ Pass Failure Timeout ]

trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt

@@ -11 +11 @@
       (scrollable area size 485 300)
       (contents size 485 420)
-      (layout viewport at (500,300) size 485x300)
+      (layout viewport at (0,0) size 485x300)
       (min layout viewport origin (0,0))
       (max layout viewport origin (0,120))

trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt

@@ -16 +16 @@
           (scrollable area size 485 300)
           (contents size 485 420)
-          (layout viewport at (500,300) size 485x300)
+          (layout viewport at (0,0) size 485x300)
           (min layout viewport origin (0,0))
           (max layout viewport origin (0,120))

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Two tiled drawing tests failing with visual viewports enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=165489
+
+        Reviewed by Dean Jackson.
+
+        computeLayoutViewportOrigin() gets called for iframes when the layout viewport
+        is zero-sized, but the visual viewport is non-zero. It doesn't really make sense
+        to compute a layout viewport when the visual viewport is larger than the layout
+        viewport, but if this happens just anchor the layout viewport at the origin
+        of the visual viewport.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::computeLayoutViewportOrigin):
+
 2016-12-04  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1799 +1799 @@
     LayoutPoint layoutViewportOrigin = layoutViewport.location();
 
-    if (visualViewport.x() < layoutViewport.x() || visualViewport.x() < stableLayoutViewportOriginMin.x())
+    if (visualViewport.width() > layoutViewport.width())
         layoutViewportOrigin.setX(visualViewport.x());
-
-    if (visualViewport.y() < layoutViewport.y() || visualViewport.y() < stableLayoutViewportOriginMin.y())
+    else {
+        if (visualViewport.x() < layoutViewport.x() || visualViewport.x() < stableLayoutViewportOriginMin.x())
+            layoutViewportOrigin.setX(visualViewport.x());
+
+        if (visualViewport.maxX() > layoutViewport.maxX() || (visualViewport.maxX() - layoutViewport.width()) > stableLayoutViewportOriginMax.x())
+            layoutViewportOrigin.setX(visualViewport.maxX() - layoutViewport.width());
+    }
+
+    if (visualViewport.height() > layoutViewport.height())
         layoutViewportOrigin.setY(visualViewport.y());
-
-    if (visualViewport.maxX() > layoutViewport.maxX() || (visualViewport.maxX() - layoutViewport.width()) > stableLayoutViewportOriginMax.x())
-        layoutViewportOrigin.setX(visualViewport.maxX() - layoutViewport.width());
-
-    if (visualViewport.maxY() > layoutViewport.maxY() || (visualViewport.maxY() - layoutViewport.height()) > stableLayoutViewportOriginMax.y())
-        layoutViewportOrigin.setY(visualViewport.maxY() - layoutViewport.height());
+    else {
+        if (visualViewport.y() < layoutViewport.y() || visualViewport.y() < stableLayoutViewportOriginMin.y())
+            layoutViewportOrigin.setY(visualViewport.y());
+
+        if (visualViewport.maxY() > layoutViewport.maxY() || (visualViewport.maxY() - layoutViewport.height()) > stableLayoutViewportOriginMax.y())
+            layoutViewportOrigin.setY(visualViewport.maxY() - layoutViewport.height());
+    }
 
     return layoutViewportOrigin;