Changeset 204931 in webkit
- Timestamp:
- Aug 24, 2016, 1:53:30 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 2 deleted
- 13 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/LayoutTests/ChangeLog ¶
r204927 r204931 1 2016-08-24 Simon Fraser <simon.fraser@apple.com> 2 3 [iOS DRT] Get basic viewport tests working in DRT 4 https://bugs.webkit.org/show_bug.cgi?id=161160 5 6 Reviewed by Tim Horton. 7 8 Enable some fast/viewport/ios/ tests for ios-simulator-wk1 that work now. 9 10 "body-overflow-hidden" tests should pass everywhere now since the behavior of overflow:hidden 11 on the body was reverted. 12 13 * fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-expected.txt: 14 * fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt: 15 * fast/viewport/ios/width-is-device-width-overflowing-expected.txt: 16 * platform/ios-simulator-wk1/TestExpectations: 17 * platform/ios-simulator-wk1/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt: Renamed from LayoutTests/platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-expected.txt. 18 * platform/ios-simulator-wk2/TestExpectations: 19 * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-expected.txt: Removed. 20 * platform/ios-simulator/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt: Removed. 21 1 22 2016-08-24 Ryan Haddad <ryanhaddad@apple.com> 2 23 -
TabularUnified trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-expected.txt ¶
r190808 r204931 1 1 Viewport: width=device-width 2 2 3 scale 5.000003 scale 1.00000 4 4 maxScale 5.00000 5 minScale 5.000006 visibleRect {"left":"0.00000","top":"0.00000","width":" 64.00000","height":"96.00000"}5 minScale 1.00000 6 visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"} 7 7 -
TabularUnified trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt ¶
r190260 r204931 1 1 Viewport: width=device-width 2 2 3 scale 1.052633 scale 0.55469 4 4 maxScale 5.00000 5 minScale 1.052636 visibleRect {"left":"0.00000","top":"0.00000","width":" 303.99999","height":"455.99998"}5 minScale 0.55469 6 visibleRect {"left":"0.00000","top":"0.00000","width":"576.90143","height":"1024.00000"} 7 7 -
TabularUnified trunk/LayoutTests/fast/viewport/ios/width-is-device-width-overflowing-expected.txt ¶
r194246 r204931 4 4 maxScale 5.00000 5 5 minScale 1.00000 6 visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":" 480.00000"}6 visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"} 7 7 -
TabularUnified trunk/LayoutTests/platform/ios-simulator-wk1/TestExpectations ¶
r204926 r204931 2 2 # 3 3 # See http://trac.webkit.org/wiki/TestExpectations for more information on this file. 4 5 # Selectively re-enable viewport tests that work 6 fast/viewport/ios/width-is-device-width.html [ Pass ] 7 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass ] 8 fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit.html [ Pass ] 9 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass ] 10 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass ] 11 fast/viewport/ios/ipad/width-is-device-width.html [ Pass ] 4 12 5 13 # <rdar://problem/6501130> LayoutTests: Enable editing tests after we support editing -
TabularUnified trunk/LayoutTests/platform/ios-simulator-wk1/fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall-expected.txt ¶
r204930 r204931 4 4 maxScale 5.00000 5 5 minScale 1.00000 6 visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":" 480.00000"}6 visibleRect {"left":"0.00000","top":"0.00000","width":"320.00000","height":"568.00000"} 7 7 -
TabularUnified trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations ¶
r204926 r204931 1770 1770 # Forcing always allow user scalable is not supported on certain OS version. 1771 1771 webkit.org/b/155056 fast/viewport/ios/force-always-user-scalable.html [ Skip ] 1772 webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass Failure ]1773 webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass Failure ]1774 webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass Failure ]1775 fast/viewport/ios/width-is-device-width.html [ Pass ]1776 fast/viewport/ios/width-is-device-width-overflowing-no-shrink-to-fit.html [ Pass ]1777 1772 1778 1773 webkit.org/b/155501 animations/3d/transform-origin-vs-functions.html [ Pass Failure ] -
TabularUnified trunk/Tools/ChangeLog ¶
r204930 r204931 1 2016-08-24 Simon Fraser <simon.fraser@apple.com> 2 3 [iOS DRT] Get basic viewport tests working in DRT 4 https://bugs.webkit.org/show_bug.cgi?id=161160 5 6 Reviewed by Tim Horton. 7 8 Hook up enough of UIScriptController in iOS DRT to be able to read viewport 9 scale, and get the contentVisibleRect. 10 11 Requires exposing a bit of UIWebBrowserView SPI from UIKit, which in turn 12 requires typing the gWebBrowserView as a DumpRenderTreeBrowserView * everywhere. 13 14 One test has different results between DRT and WTR, but DRT behavior seems to differ 15 from UIWebView here, so just give it a WK1-specific result. 16 17 * DumpRenderTree/ios/DumpRenderTreeBrowserView.h: 18 * DumpRenderTree/ios/DumpRenderTreeBrowserView.mm: 19 (-[DumpRenderTreeBrowserView documentVisibleRect]): 20 * DumpRenderTree/ios/PixelDumpSupportIOS.mm: 21 * DumpRenderTree/ios/UIScriptControllerIOS.mm: 22 (WTR::UIScriptController::zoomScale): 23 (WTR::UIScriptController::minimumZoomScale): 24 (WTR::UIScriptController::maximumZoomScale): 25 (WTR::UIScriptController::contentVisibleRect): 26 * DumpRenderTree/mac/DumpRenderTree.mm: 27 (createWebViewAndOffscreenWindow): 28 * DumpRenderTree/mac/DumpRenderTreeMac.h: 29 1 30 2016-08-24 Simon Fraser <simon.fraser@apple.com> 2 31 -
TabularUnified trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h ¶
r178080 r204931 34 34 35 35 @end 36 37 @interface DumpRenderTreeBrowserView (DRTTesting) 38 39 - (CGRect)documentVisibleRect; 40 41 @end -
TabularUnified trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm ¶
r162817 r204931 24 24 */ 25 25 26 #import "config.h" 26 27 #import "DumpRenderTreeBrowserView.h" 27 28 … … 32 33 @interface UIWebBrowserView (WebUIKitDelegate) 33 34 - (BOOL)webView:(WebView *)webView shouldScrollToPoint:(CGPoint)point forFrame:(WebFrame *)frame; 35 @end 36 37 @interface UIWebBrowserView (UIKitInternals) 38 - (CGRect)_documentViewVisibleRect; 34 39 @end 35 40 … … 74 79 @end 75 80 81 @implementation DumpRenderTreeBrowserView (DRTTesting) 82 83 - (CGRect)documentVisibleRect 84 { 85 return [self _documentViewVisibleRect]; 86 } 87 88 @end 89 76 90 #endif // PLATFORM(IOS) -
TabularUnified trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm ¶
r202411 r204931 47 47 48 48 extern DumpRenderTreeWindow *gDrtWindow; 49 extern UIWebBrowserView *gWebBrowserView;49 extern DumpRenderTreeBrowserView *gWebBrowserView; 50 50 51 51 PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect) -
TabularUnified trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm ¶
r204877 r204931 29 29 #if PLATFORM(IOS) 30 30 31 #import "DumpRenderTreeBrowserView.h" 31 32 #import "UIScriptContext.h" 33 #import <WebCore/FloatRect.h> 34 35 extern DumpRenderTreeBrowserView *gWebBrowserView; 36 extern UIWebScrollView *gWebScrollView; 32 37 33 38 namespace WTR { … … 50 55 double UIScriptController::zoomScale() const 51 56 { 52 return 1;57 return gWebScrollView.zoomScale; 53 58 } 54 59 … … 107 112 double UIScriptController::minimumZoomScale() const 108 113 { 109 return 1;114 return gWebScrollView.minimumZoomScale; 110 115 } 111 116 112 117 double UIScriptController::maximumZoomScale() const 113 118 { 114 return 1;119 return gWebScrollView.maximumZoomScale; 115 120 } 116 121 117 122 JSObjectRef UIScriptController::contentVisibleRect() const 118 123 { 119 return nullptr; 124 CGRect contentVisibleRect = [gWebBrowserView documentVisibleRect]; 125 WebCore::FloatRect rect(contentVisibleRect.origin.x, contentVisibleRect.origin.y, contentVisibleRect.size.width, contentVisibleRect.size.height); 126 return m_context->objectFromRect(rect); 120 127 } 121 128 -
TabularUnified trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm ¶
r204929 r204931 222 222 #if PLATFORM(IOS) 223 223 const CGRect layoutTestViewportRect = { {0, 0}, {static_cast<CGFloat>(TestRunner::viewWidth), static_cast<CGFloat>(TestRunner::viewHeight)} }; 224 UIWebBrowserView *gWebBrowserView = nil;224 DumpRenderTreeBrowserView *gWebBrowserView = nil; 225 225 UIWebScrollView *gWebScrollView = nil; 226 226 DumpRenderTreeWindow *gDrtWindow = nil; … … 759 759 WebView *webView = [[WebView alloc] initWithFrame:rect frameName:nil groupName:@"org.webkit.DumpRenderTree"]; 760 760 #else 761 UIWebBrowserView *webBrowserView = [[[DumpRenderTreeBrowserView alloc] initWithFrame:layoutTestViewportRect] autorelease];761 DumpRenderTreeBrowserView *webBrowserView = [[[DumpRenderTreeBrowserView alloc] initWithFrame:layoutTestViewportRect] autorelease]; 762 762 [webBrowserView setInputViewObeysDOMFocus:YES]; 763 763 WebView *webView = [[webBrowserView webView] retain]; -
TabularUnified trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h ¶
r202034 r204931 70 70 @end 71 71 72 @class UIWebBrowserView;73 extern UIWebBrowserView *gWebBrowserView;72 @class DumpRenderTreeBrowserView; 73 extern DumpRenderTreeBrowserView *gWebBrowserView; 74 74 #endif 75 75
Note:
See TracChangeset
for help on using the changeset viewer.