Diff
Modified: trunk/LayoutTests/ChangeLog (204362 => 204363)
--- trunk/LayoutTests/ChangeLog 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/ChangeLog 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,3 +1,24 @@
+2016-08-10 Simon Fraser <[email protected]>
+
+ [iOS WK2] Use the simulated device's screen size, rather than a harcoded size
+ https://bugs.webkit.org/show_bug.cgi?id=160748
+
+ Reviewed by Tim Horton.
+
+ Move fast/viewport/ios skipping to ios-simulator-wk2/TestExpectations since the tests
+ are WK2-only.
+
+ * fast/viewport/ios/width-is-device-width-expected.txt:
+ * fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt:
+ * platform/ios-simulator-wk2/TestExpectations:
+ * platform/ios-simulator/TestExpectations:
+ * platform/ios-simulator/fast/scrolling/ios/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.txt:
+ * platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt:
+ * platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt:
+ * platform/ios-simulator/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt:
+ * platform/ios-simulator/fast/scrolling/ios/touch-stacking-expected.txt:
+ * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt: Removed.
+
2016-08-10 Nan Wang <[email protected]>
AX: Media controls timeline should have percentage value description
Modified: trunk/LayoutTests/fast/viewport/ios/width-is-device-width-expected.txt (204362 => 204363)
--- trunk/LayoutTests/fast/viewport/ios/width-is-device-width-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/fast/viewport/ios/width-is-device-width-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -3,4 +3,4 @@
scale 1.00000
maxScale 5.00000
minScale 1.00000
-visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
+visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"}
Modified: trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt (204362 => 204363)
--- trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -3,5 +3,5 @@
scale 1.00000
maxScale 5.00000
minScale 1.00000
-visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
+visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"}
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-08-11 00:09:38 UTC (rev 204363)
@@ -2884,13 +2884,6 @@
webkit.org/b/152935 fast/scrolling/scroll-position-on-reload-rtl.html [ Failure ]
-# Since this test directory is explicitly enabled for iOS, the passing tests are being re-enabled individually until flakiness is resolved
-webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass Failure ]
-webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass Failure ]
-webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass Failure ]
-fast/viewport/ios/width-is-device-width.html [ Pass ]
-fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit.html [ Pass ]
-
webkit.org/b/153371 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
webkit.org/b/153498 svg/dom/SVGScriptElement/script-change-externalResourcesRequired-while-loading.svg [ Pass Timeout ]
Modified: trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.txt (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,5 +1,5 @@
-layer at (0,0) size 320x480
- RenderView at (0,0) size 320x480
+layer at (0,0) size 320x568
+ RenderView at (0,0) size 320x568
layer at (0,0) size 320x316
RenderBlock {HTML} at (0,0) size 320x316
RenderBody {BODY} at (8,8) size 304x300
Modified: trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,9 +1,9 @@
(GraphicsLayer
(anchor 0.00 0.00)
- (bounds 320.00 480.00)
+ (bounds 320.00 568.00)
(children 1
(GraphicsLayer
- (bounds 320.00 480.00)
+ (bounds 320.00 568.00)
(contentsOpaque 1)
(children 1
(GraphicsLayer
Modified: trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,9 +1,9 @@
(GraphicsLayer
(anchor 0.00 0.00)
- (bounds 330.00 480.00)
+ (bounds 330.00 568.00)
(children 1
(GraphicsLayer
- (bounds 330.00 480.00)
+ (bounds 330.00 568.00)
(contentsOpaque 1)
(children 1
(GraphicsLayer
Modified: trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,9 +1,9 @@
(GraphicsLayer
(anchor 0.00 0.00)
- (bounds 320.00 480.00)
+ (bounds 320.00 568.00)
(children 1
(GraphicsLayer
- (bounds 320.00 480.00)
+ (bounds 320.00 568.00)
(contentsOpaque 1)
(children 1
(GraphicsLayer
Modified: trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/touch-stacking-expected.txt (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/touch-stacking-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/touch-stacking-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,5 +1,5 @@
-layer at (0,0) size 320x480
- RenderView at (0,0) size 320x480
+layer at (0,0) size 320x568
+ RenderView at (0,0) size 320x568
layer at (0,0) size 320x148 layerType: background only
layer at (0,0) size 100x100
RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
Deleted: trunk/LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,7 +0,0 @@
-Viewport: width=device-width, shrink-to-fit=no
-
-scale 1.00000
-maxScale 5.00000
-minScale 1.00000
-visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
-
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (204362 => 204363)
--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1839,6 +1839,11 @@
# Forcing always allow user scalable is not supported on certain OS version.
webkit.org/b/155056 fast/viewport/ios/force-always-user-scalable.html [ Skip ]
+webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass Failure ]
+webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass Failure ]
+webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass Failure ]
+fast/viewport/ios/width-is-device-width.html [ Pass ]
+fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit.html [ Pass ]
webkit.org/b/155501 animations/3d/transform-origin-vs-functions.html [ Pass Failure ]
Modified: trunk/Tools/ChangeLog (204362 => 204363)
--- trunk/Tools/ChangeLog 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/Tools/ChangeLog 2016-08-11 00:09:38 UTC (rev 204363)
@@ -1,5 +1,18 @@
2016-08-10 Simon Fraser <[email protected]>
+ [iOS WK2] Use the simulated device's screen size, rather than a harcoded size
+ https://bugs.webkit.org/show_bug.cgi?id=160748
+
+ Reviewed by Tim Horton.
+
+ Use the main UIScreen's bounds for the window size if we're using a flexible viewport. This
+ opens the door for tests using other device sizes.
+
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+
+2016-08-10 Simon Fraser <[email protected]>
+
Sort the feature flags in the FEATURE_DEFINES lines
https://bugs.webkit.org/show_bug.cgi?id=160742
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (204362 => 204363)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-08-10 23:45:05 UTC (rev 204362)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-08-11 00:09:38 UTC (rev 204363)
@@ -89,10 +89,8 @@
void TestController::platformConfigureViewForTest(const TestInvocation& test)
{
if (test.options().useFlexibleViewport) {
- const unsigned phoneViewHeight = 480;
- const unsigned phoneViewWidth = 320;
-
- mainWebView()->resizeTo(phoneViewWidth, phoneViewHeight);
+ CGRect screenBounds = [UIScreen mainScreen].bounds;
+ mainWebView()->resizeTo(screenBounds.size.width, screenBounds.size.height);
// We also pass data to InjectedBundle::beginTesting() to have it call
// WKBundlePageSetUseTestingViewportConfiguration(false).
}
