Diff
Modified: trunk/LayoutTests/ChangeLog (204522 => 204523)
--- trunk/LayoutTests/ChangeLog 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/LayoutTests/ChangeLog 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1,3 +1,24 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ [iOS] Add iPad viewport and form tests, and revert the iPad-testing part of r202132
+ https://bugs.webkit.org/show_bug.cgi?id=160878
+
+ Reviewed by Tim Horton.
+
+ Move forms/ios/focus-input-via-button-ipad.html into fast/forms/ios/ipad, making it
+ an iPad test, which allows for the removal of the "useIPadBehavior" flag.
+
+ Add fast/viewport/ios/ipad/width-is-device-width.html with iPad-specific results.
+
+ * fast/forms/ios/ipad/focus-input-via-button-expected.txt: Renamed from LayoutTests/fast/forms/ios/focus-input-via-button-ipad-expected.txt.
+ * fast/forms/ios/ipad/focus-input-via-button.html: Renamed from LayoutTests/fast/forms/ios/focus-input-via-button-ipad.html.
+ * fast/forms/ios/resources/zooming-test-utils.js:
+ (testZoomAfterTap):
+ * fast/viewport/ios/ipad/width-is-device-width-expected.txt: Added.
+ * fast/viewport/ios/ipad/width-is-device-width.html: Added.
+ * platform/ios-simulator-wk2/TestExpectations: Enable fast/viewport/ios, because leaving
+ them skipped from the base TestExpectations is evil.
+
2016-08-16 Chris Dumez <[email protected]>
querySelector() / querySelectorAll() should always throw a SyntaxError when failing to parse selector string
Deleted: trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad-expected.txt (204522 => 204523)
--- trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad-expected.txt 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad-expected.txt 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1,7 +0,0 @@
-Tests zooming into a text input on tap.
-
-Click to focus input
-
-tap location { x: 20.000, y: 62.000 }
-scale 1.455
-visibleRect { left: 0.000, top: 798.797, width: 219.979, height: 390.462 }
Deleted: trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad.html (204522 => 204523)
--- trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad.html 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad.html 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1,44 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
-
-<html>
-<head>
- <meta name="viewport" content="initial-scale=0.5">
- <style>
- input[type="text"] {
- margin: 800px 20px;
- }
- button {
- display: block;
- }
- </style>
-
- <script src=""
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function buttonClicked()
- {
- document.getElementById('input').focus();
- }
-
- function doTest()
- {
- const useIPadZoomingBehavior = true;
- testZoomAfterTap(document.getElementById('target'), 10, 10, useIPadZoomingBehavior);
- }
-
- window.addEventListener('load', doTest, false);
- </script>
-</head>
-<body>
-
-<p>Tests zooming into a text input on tap.</p>
-<button id="target" _onclick_="buttonClicked()">Click to focus input</button>
-
-<input id="input" type="text">
-
-</body>
-</html>
Copied: trunk/LayoutTests/fast/forms/ios/ipad/focus-input-via-button-expected.txt (from rev 204522, trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad-expected.txt) (0 => 204523)
--- trunk/LayoutTests/fast/forms/ios/ipad/focus-input-via-button-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/ipad/focus-input-via-button-expected.txt 2016-08-16 21:18:44 UTC (rev 204523)
@@ -0,0 +1,7 @@
+Tests zooming into a text input on tap.
+
+Click to focus input
+
+tap location { x: 20.000, y: 62.000 }
+scale 1.500
+visibleRect { left: 0.000, top: 654.667, width: 512.000, height: 682.667 }
Copied: trunk/LayoutTests/fast/forms/ios/ipad/focus-input-via-button.html (from rev 204522, trunk/LayoutTests/fast/forms/ios/focus-input-via-button-ipad.html) (0 => 204523)
--- trunk/LayoutTests/fast/forms/ios/ipad/focus-input-via-button.html (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/ipad/focus-input-via-button.html 2016-08-16 21:18:44 UTC (rev 204523)
@@ -0,0 +1,43 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.5">
+ <style>
+ input[type="text"] {
+ margin: 800px 20px;
+ }
+ button {
+ display: block;
+ }
+ </style>
+
+ <script src=""
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function buttonClicked()
+ {
+ document.getElementById('input').focus();
+ }
+
+ function doTest()
+ {
+ testZoomAfterTap(document.getElementById('target'), 10, 10);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+<p>Tests zooming into a text input on tap.</p>
+<button id="target" _onclick_="buttonClicked()">Click to focus input</button>
+
+<input id="input" type="text">
+
+</body>
+</html>
Modified: trunk/LayoutTests/fast/forms/ios/resources/zooming-test-utils.js (204522 => 204523)
--- trunk/LayoutTests/fast/forms/ios/resources/zooming-test-utils.js 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/LayoutTests/fast/forms/ios/resources/zooming-test-utils.js 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1,5 +1,5 @@
-function testZoomAfterTap(targetElement, xOffset, yOffset, useIPadBehavior)
+function testZoomAfterTap(targetElement, xOffset, yOffset)
{
if (!window.testRunner || !testRunner.runUIScript)
return;
@@ -6,7 +6,7 @@
var point = getPointInsideElement(targetElement, xOffset, yOffset);
- var uiScript = zoomAfterSingleTapUIScript(point.x, point.y, useIPadBehavior);
+ var uiScript = zoomAfterSingleTapUIScript(point.x, point.y);
testRunner.runUIScript(uiScript, function(result) {
var results = tableFromJSON(result);
document.body.appendChild(results);
@@ -14,7 +14,7 @@
});
}
-function zoomAfterSingleTapUIScript(x, y, useIPadBehavior)
+function zoomAfterSingleTapUIScript(x, y)
{
return `
(function() {
@@ -34,8 +34,6 @@
uiController.uiScriptComplete(result);
};
- if (${useIPadBehavior})
- uiController.forceIPadStyleZoomOnInputFocus = true;
uiController.singleTapAtPoint(${x}, ${y}, function() {});
})();`
}
Added: trunk/LayoutTests/fast/viewport/ios/ipad/width-is-device-width-expected.txt (0 => 204523)
--- trunk/LayoutTests/fast/viewport/ios/ipad/width-is-device-width-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/ipad/width-is-device-width-expected.txt 2016-08-16 21:18:44 UTC (rev 204523)
@@ -0,0 +1,6 @@
+Viewport: width=device-width
+
+scale 1.00000
+maxScale 5.00000
+minScale 1.00000
+visibleRect {"left":"0.00000","top":"0.00000","width":"768.00000","height":"1024.00000"}
Added: trunk/LayoutTests/fast/viewport/ios/ipad/width-is-device-width.html (0 => 204523)
--- trunk/LayoutTests/fast/viewport/ios/ipad/width-is-device-width.html (rev 0)
+++ trunk/LayoutTests/fast/viewport/ios/ipad/width-is-device-width.html 2016-08-16 21:18:44 UTC (rev 204523)
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta name="viewport" content="width=device-width">
+ <script src=""
+</head>
+<body _onload_="runTest()">
+
+<p>Viewport: <span id="viewport"></span></p>
+<div id="result"></div>
+
+</body>
+</html>
Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (204522 => 204523)
--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-16 21:18:44 UTC (rev 204523)
@@ -8,8 +8,9 @@
fast/harness/ui-side-scripts.html [ Pass ]
fast/harness/concurrent-ui-side-scripts.html [ Pass ]
+fast/scrolling/ios [ Pass ]
+fast/viewport/ios [ Pass ]
fast/zooming/ios [ Pass ]
-fast/scrolling/ios [ Pass ]
#//////////////////////////////////////////////////////////////////////////////////////////
# End platform-specific directories.
Modified: trunk/Source/WebKit2/ChangeLog (204522 => 204523)
--- trunk/Source/WebKit2/ChangeLog 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1,3 +1,26 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ [iOS] Add iPad viewport and form tests, and revert the iPad-testing part of r202132
+ https://bugs.webkit.org/show_bug.cgi?id=160878
+
+ Reviewed by Tim Horton.
+
+ Remove testing-specific "forceIPadStyleZoomOnInputFocus" behavior added in r202132
+ now that we have the ability to run tests in the iPad simulator.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView forceIPadStyleZoomOnInputFocus]): Deleted.
+ (-[WKWebView setForceIPadStyleZoomOnInputFocus:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _displayFormNodeInputView]):
+ (-[WKContentView requiresAccessoryView]):
+ (-[WKContentView inputAccessoryView]):
+ (-[WKContentView requiresAccessoryView:]): Deleted.
+ (-[WKContentView forceIPadStyleZoomOnInputFocus]): Deleted.
+ (-[WKContentView setForceIPadStyleZoomOnInputFocus:]): Deleted.
+
2016-08-16 Alex Christensen <[email protected]>
Clean up WebSockets
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (204522 => 204523)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-08-16 21:18:44 UTC (rev 204523)
@@ -4517,16 +4517,6 @@
[_contentView accessoryTab:NO];
}
-- (BOOL)forceIPadStyleZoomOnInputFocus
-{
- return [_contentView forceIPadStyleZoomOnInputFocus];
-}
-
-- (void)setForceIPadStyleZoomOnInputFocus:(BOOL)forceIPadStyleZoom
-{
- [_contentView setForceIPadStyleZoomOnInputFocus:forceIPadStyleZoom];
-}
-
#endif // PLATFORM(IOS)
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (204522 => 204523)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-08-16 21:18:44 UTC (rev 204523)
@@ -260,8 +260,6 @@
- (void)keyboardAccessoryBarNext WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)keyboardAccessoryBarPrevious WK_API_AVAILABLE(ios(WK_IOS_TBA));
-
-@property (nonatomic) BOOL forceIPadStyleZoomOnInputFocus WK_API_AVAILABLE(ios(WK_IOS_TBA));
#endif
#if !TARGET_OS_IPHONE
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (204522 => 204523)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2016-08-16 21:18:44 UTC (rev 204523)
@@ -171,9 +171,6 @@
BOOL _showDebugTapHighlightsForFastClicking;
BOOL _resigningFirstResponder;
-
- // For testing.
- BOOL _forceIPadStyleZoomOnInputFocus;
}
@end
@@ -234,10 +231,4 @@
@end
#endif
-@interface WKContentView (WKInteractionTesting)
-
-@property (nonatomic) BOOL forceIPadStyleZoomOnInputFocus;
-
-@end
-
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (204522 => 204523)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1072,8 +1072,8 @@
fontSize:_assistedNodeInformation.nodeFontSize
minimumScale:_assistedNodeInformation.minimumScaleFactor
maximumScale:_assistedNodeInformation.maximumScaleFactor
- allowScaling:(_assistedNodeInformation.allowsUserScalingIgnoringForceAlwaysScaling && (!UICurrentUserInterfaceIdiomIsPad() || _forceIPadStyleZoomOnInputFocus))
- forceScroll:[self requiresAccessoryView:_forceIPadStyleZoomOnInputFocus]];
+ allowScaling:(_assistedNodeInformation.allowsUserScalingIgnoringForceAlwaysScaling && !UICurrentUserInterfaceIdiomIsPad())
+ forceScroll:[self requiresAccessoryView]];
_didAccessoryTabInitiateFocus = NO;
[self _ensureFormAccessoryView];
@@ -1573,7 +1573,7 @@
[_textSelectionAssistant didEndScrollingOverflow];
}
-- (BOOL)requiresAccessoryView:(BOOL)forceIPadBehavior
+- (BOOL)requiresAccessoryView
{
if ([_formInputSession accessoryViewShouldNotShow])
return NO;
@@ -1598,7 +1598,7 @@
case InputType::Month:
case InputType::Week:
case InputType::Time:
- return !(UICurrentUserInterfaceIdiomIsPad() || forceIPadBehavior);
+ return !UICurrentUserInterfaceIdiomIsPad();
}
}
@@ -1613,7 +1613,7 @@
- (UIView *)inputAccessoryView
{
- if (![self requiresAccessoryView:NO])
+ if (![self requiresAccessoryView])
return nil;
return self.formAccessoryView;
@@ -4110,21 +4110,6 @@
#endif
-@implementation WKContentView (WKInteractionTesting)
-
-- (BOOL)forceIPadStyleZoomOnInputFocus
-{
- return _forceIPadStyleZoomOnInputFocus;
-}
-
-- (void)setForceIPadStyleZoomOnInputFocus:(BOOL)forceIPadStyleZoom
-{
- _forceIPadStyleZoomOnInputFocus = forceIPadStyleZoom;
-}
-
-@end
-
-
// UITextRange, UITextPosition and UITextSelectionRect implementations for WK2
@implementation WKTextRange (UITextInputAdditions)
Modified: trunk/Tools/ChangeLog (204522 => 204523)
--- trunk/Tools/ChangeLog 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Tools/ChangeLog 2016-08-16 21:18:44 UTC (rev 204523)
@@ -1,3 +1,24 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ [iOS] Add iPad viewport and form tests, and revert the iPad-testing part of r202132
+ https://bugs.webkit.org/show_bug.cgi?id=160878
+
+ Reviewed by Tim Horton.
+
+ Remove testing-specific "forceIPadStyleZoomOnInputFocus" behavior added in r202132
+ now that we have the ability to run tests in the iPad simulator.
+
+ * WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl:
+ * WebKitTestRunner/UIScriptContext/UIScriptController.cpp:
+ (WTR::UIScriptController::forceIPadStyleZoomOnInputFocus): Deleted.
+ (WTR::UIScriptController::setForceIPadStyleZoomOnInputFocus): Deleted.
+ * WebKitTestRunner/UIScriptContext/UIScriptController.h:
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformResetStateToConsistentValues): Deleted.
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::forceIPadStyleZoomOnInputFocus): Deleted.
+ (WTR::UIScriptController::setForceIPadStyleZoomOnInputFocus): Deleted.
+
2016-08-15 Anders Carlsson <[email protected]>
Add an address-of operator to RetainPtr
Modified: trunk/Tools/WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl (204522 => 204523)
--- trunk/Tools/WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Tools/WebKitTestRunner/UIScriptContext/Bindings/UIScriptController.idl 2016-08-16 21:18:44 UTC (rev 204523)
@@ -60,8 +60,5 @@
readonly attribute object contentVisibleRect; // Returned object has 'left', 'top', 'width', 'height' properties.
- // Behavior
- attribute boolean forceIPadStyleZoomOnInputFocus;
-
void uiScriptComplete(DOMString result);
};
Modified: trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.cpp (204522 => 204523)
--- trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.cpp 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.cpp 2016-08-16 21:18:44 UTC (rev 204523)
@@ -178,15 +178,6 @@
return nullptr;
}
-bool UIScriptController::forceIPadStyleZoomOnInputFocus() const
-{
- return false;
-}
-
-void UIScriptController::setForceIPadStyleZoomOnInputFocus(bool)
-{
-}
-
void UIScriptController::platformSetWillBeginZoomingCallback()
{
}
Modified: trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.h (204522 => 204523)
--- trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.h 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.h 2016-08-16 21:18:44 UTC (rev 204523)
@@ -81,9 +81,6 @@
JSObjectRef contentVisibleRect() const;
- bool forceIPadStyleZoomOnInputFocus() const;
- void setForceIPadStyleZoomOnInputFocus(bool);
-
void uiScriptComplete(JSStringRef result);
private:
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (204522 => 204523)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2016-08-16 21:18:44 UTC (rev 204523)
@@ -83,7 +83,6 @@
void TestController::platformResetStateToConsistentValues()
{
cocoaResetStateToConsistentValues();
- [mainWebView()->platformView() setForceIPadStyleZoomOnInputFocus:NO];
}
void TestController::platformConfigureViewForTest(const TestInvocation& test)
Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (204522 => 204523)
--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2016-08-16 20:58:00 UTC (rev 204522)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2016-08-16 21:18:44 UTC (rev 204523)
@@ -209,18 +209,6 @@
return m_context->objectFromRect(wkRect);
}
-bool UIScriptController::forceIPadStyleZoomOnInputFocus() const
-{
- TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
- return webView.forceIPadStyleZoomOnInputFocus;
-}
-
-void UIScriptController::setForceIPadStyleZoomOnInputFocus(bool value)
-{
- TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
- webView.forceIPadStyleZoomOnInputFocus = value;
-}
-
void UIScriptController::platformSetWillBeginZoomingCallback()
{
TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
