Changeset 204363 in webkit


Ignore:
Timestamp:
Aug 10, 2016 5:09:38 PM (8 years ago)
Author:
Simon Fraser
Message:

[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.

Tools:

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

LayoutTests:

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.
Location:
trunk
Files:
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r204361 r204363  
     12016-08-10  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] Use the simulated device's screen size, rather than a harcoded size
     4        https://bugs.webkit.org/show_bug.cgi?id=160748
     5
     6        Reviewed by Tim Horton.
     7       
     8        Move fast/viewport/ios skipping to ios-simulator-wk2/TestExpectations since the tests
     9        are WK2-only.
     10
     11        * fast/viewport/ios/width-is-device-width-expected.txt:
     12        * fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt:
     13        * platform/ios-simulator-wk2/TestExpectations:
     14        * platform/ios-simulator/TestExpectations:
     15        * platform/ios-simulator/fast/scrolling/ios/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.txt:
     16        * platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt:
     17        * platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt:
     18        * platform/ios-simulator/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt:
     19        * platform/ios-simulator/fast/scrolling/ios/touch-stacking-expected.txt:
     20        * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt: Removed.
     21
    1222016-08-10  Nan Wang  <n_wang@apple.com>
    223

  • trunk/LayoutTests/fast/viewport/ios/width-is-device-width-expected.txt

    r190260 r204363  
    44maxScale        5.00000
    55minScale        1.00000
    6 visibleRect     {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
     6visibleRect     {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"}

  • trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit-expected.txt

    r190260 r204363  
    44maxScale        5.00000
    55minScale        1.00000
    6 visibleRect     {"left":"0.00000","top":"0.00000","width":"320.00000","height":"480.00000"}
     6visibleRect     {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"}
    77

  • trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations

    r204197 r204363  
    18401840# Forcing always allow user scalable is not supported on certain OS version.
    18411841webkit.org/b/155056 fast/viewport/ios/force-always-user-scalable.html [ Skip ]
     1842webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass Failure ]
     1843webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass Failure ]
     1844webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass Failure ]
     1845fast/viewport/ios/width-is-device-width.html [ Pass ]
     1846fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit.html [ Pass ]
    18421847
    18431848webkit.org/b/155501 animations/3d/transform-origin-vs-functions.html [ Pass Failure ]

  • trunk/LayoutTests/platform/ios-simulator/TestExpectations

    r204191 r204363  
    28852885webkit.org/b/152935 fast/scrolling/scroll-position-on-reload-rtl.html [ Failure ]
    28862886
    2887 # Since this test directory is explicitly enabled for iOS, the passing tests are being re-enabled individually until flakiness is resolved
    2888 webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass Failure ]
    2889 webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass Failure ]
    2890 webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass Failure ]
    2891 fast/viewport/ios/width-is-device-width.html [ Pass ]
    2892 fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit.html [ Pass ]
    2893 
    28942887webkit.org/b/153371 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
    28952888

  • trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.txt

    r200609 r204363  
    1 layer at (0,0) size 320x480
    2   RenderView at (0,0) size 320x480
     1layer at (0,0) size 320x568
     2  RenderView at (0,0) size 320x568
    33layer at (0,0) size 320x316
    44  RenderBlock {HTML} at (0,0) size 320x316

  • trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-expected.txt

    r200609 r204363  
    11(GraphicsLayer
    22  (anchor 0.00 0.00)
    3   (bounds 320.00 480.00)
     3  (bounds 320.00 568.00)
    44  (children 1
    55    (GraphicsLayer
    6       (bounds 320.00 480.00)
     6      (bounds 320.00 568.00)
    77      (contentsOpaque 1)
    88      (children 1

  • trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/overflow-scrolling-ancestor-clip-size-expected.txt

    r200609 r204363  
    11(GraphicsLayer
    22  (anchor 0.00 0.00)
    3   (bounds 330.00 480.00)
     3  (bounds 330.00 568.00)
    44  (children 1
    55    (GraphicsLayer
    6       (bounds 330.00 480.00)
     6      (bounds 330.00 568.00)
    77      (contentsOpaque 1)
    88      (children 1

  • trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/scrolling-content-clip-to-viewport-expected.txt

    r200609 r204363  
    11(GraphicsLayer
    22  (anchor 0.00 0.00)
    3   (bounds 320.00 480.00)
     3  (bounds 320.00 568.00)
    44  (children 1
    55    (GraphicsLayer
    6       (bounds 320.00 480.00)
     6      (bounds 320.00 568.00)
    77      (contentsOpaque 1)
    88      (children 1

  • trunk/LayoutTests/platform/ios-simulator/fast/scrolling/ios/touch-stacking-expected.txt

    r200609 r204363  
    1 layer at (0,0) size 320x480
    2   RenderView at (0,0) size 320x480
     1layer at (0,0) size 320x568
     2  RenderView at (0,0) size 320x568
    33layer at (0,0) size 320x148 layerType: background only
    44layer at (0,0) size 100x100

  • trunk/Tools/ChangeLog

    r204345 r204363  
     12016-08-10  Simon Fraser  <simon.fraser@apple.com>
     2
     3        [iOS WK2] Use the simulated device's screen size, rather than a harcoded size
     4        https://bugs.webkit.org/show_bug.cgi?id=160748
     5
     6        Reviewed by Tim Horton.
     7       
     8        Use the main UIScreen's bounds for the window size if we're using a flexible viewport. This
     9        opens the door for tests using other device sizes.
     10
     11        * WebKitTestRunner/ios/TestControllerIOS.mm:
     12        (WTR::TestController::platformConfigureViewForTest):
     13
    1142016-08-10  Simon Fraser  <simon.fraser@apple.com>
    215

  • trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm

    r203209 r204363  
    9090{
    9191    if (test.options().useFlexibleViewport) {
    92         const unsigned phoneViewHeight = 480;
    93         const unsigned phoneViewWidth = 320;
    94 
    95         mainWebView()->resizeTo(phoneViewWidth, phoneViewHeight);
     92        CGRect screenBounds = [UIScreen mainScreen].bounds;
     93        mainWebView()->resizeTo(screenBounds.size.width, screenBounds.size.height);
    9694        // We also pass data to InjectedBundle::beginTesting() to have it call
    9795        // WKBundlePageSetUseTestingViewportConfiguration(false).
Note: See TracChangeset for help on using the changeset viewer.