- Revision
- 265325
- Author
- wenson_hs...@apple.com
- Date
- 2020-08-06 07:46:35 -0700 (Thu, 06 Aug 2020)
Log Message
Remove UIScriptController.removeAllDynamicDictionaries()
https://bugs.webkit.org/show_bug.cgi?id=215207
Reviewed by Tim Horton.
Tools:
This script controller hook was added to help reset dictionaries to a consistent state prior to running the test
`contenteditable-autocorrect.html`, which verifies that `autocorrect="no"` on a contenteditable element works as
intended by typing "ti" and expecting it to not be autocorrected to anything else (i.e. "to").
Instead of requiring each test that involves autocorrection to call this, move this reset step into
TestController::platformResetStateToConsistentValues and remove the testing hook.
* TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl:
* TestRunnerShared/UIScriptContext/UIScriptController.h:
(WTR::UIScriptController::replaceTextAtRange):
(WTR::UIScriptController::removeAllDynamicDictionaries): Deleted.
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformResetStateToConsistentValues):
* WebKitTestRunner/ios/UIScriptControllerIOS.h:
* WebKitTestRunner/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptControllerIOS::removeAllDynamicDictionaries): Deleted.
LayoutTests:
Remove the call to UIScriptController.removeAllDynamicDictionaries.
* fast/events/ios/contenteditable-autocorrect.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (265324 => 265325)
--- trunk/LayoutTests/ChangeLog 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/LayoutTests/ChangeLog 2020-08-06 14:46:35 UTC (rev 265325)
@@ -1,3 +1,14 @@
+2020-08-06 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove UIScriptController.removeAllDynamicDictionaries()
+ https://bugs.webkit.org/show_bug.cgi?id=215207
+
+ Reviewed by Tim Horton.
+
+ Remove the call to UIScriptController.removeAllDynamicDictionaries.
+
+ * fast/events/ios/contenteditable-autocorrect.html:
+
2020-08-06 Karl Rackler <rack...@apple.com>
[ iOS wk2 ] imported/w3c/web-platform-tests/svg/import/interact-zoom-01-t-manual.svg is a flaky failure
Modified: trunk/LayoutTests/fast/events/ios/contenteditable-autocorrect.html (265324 => 265325)
--- trunk/LayoutTests/fast/events/ios/contenteditable-autocorrect.html 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/LayoutTests/fast/events/ios/contenteditable-autocorrect.html 2020-08-06 14:46:35 UTC (rev 265325)
@@ -32,7 +32,6 @@
return new Promise(function(resolve) {
let rect = editable.getBoundingClientRect();
testRunner.runUIScript(`(function() {
- uiController.removeAllDynamicDictionaries();
uiController.didShowKeyboardCallback = function() {
uiController.typeCharacterUsingHardwareKeyboard("t", function() {
uiController.typeCharacterUsingHardwareKeyboard("i", function() {
Modified: trunk/Tools/ChangeLog (265324 => 265325)
--- trunk/Tools/ChangeLog 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/Tools/ChangeLog 2020-08-06 14:46:35 UTC (rev 265325)
@@ -1,3 +1,27 @@
+2020-08-06 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Remove UIScriptController.removeAllDynamicDictionaries()
+ https://bugs.webkit.org/show_bug.cgi?id=215207
+
+ Reviewed by Tim Horton.
+
+ This script controller hook was added to help reset dictionaries to a consistent state prior to running the test
+ `contenteditable-autocorrect.html`, which verifies that `autocorrect="no"` on a contenteditable element works as
+ intended by typing "ti" and expecting it to not be autocorrected to anything else (i.e. "to").
+
+ Instead of requiring each test that involves autocorrection to call this, move this reset step into
+ TestController::platformResetStateToConsistentValues and remove the testing hook.
+
+ * TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl:
+ * TestRunnerShared/UIScriptContext/UIScriptController.h:
+ (WTR::UIScriptController::replaceTextAtRange):
+ (WTR::UIScriptController::removeAllDynamicDictionaries): Deleted.
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformResetStateToConsistentValues):
+ * WebKitTestRunner/ios/UIScriptControllerIOS.h:
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptControllerIOS::removeAllDynamicDictionaries): Deleted.
+
2020-08-06 Rob Buis <rb...@igalia.com>
build-webkit script tries to execute command xcodebuild on Linux
Modified: trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (265324 => 265325)
--- trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl 2020-08-06 14:46:35 UTC (rev 265325)
@@ -311,7 +311,6 @@
void setKeyboardInputModeIdentifier(DOMString identifier);
void replaceTextAtRange(DOMString text, long location, long length);
- void removeAllDynamicDictionaries();
readonly attribute DOMString scrollingTreeAsText;
Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (265324 => 265325)
--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2020-08-06 14:46:35 UTC (rev 265325)
@@ -186,7 +186,6 @@
virtual void setKeyboardInputModeIdentifier(JSStringRef) { notImplemented(); }
virtual void replaceTextAtRange(JSStringRef, int location, int length) { notImplemented(); }
- virtual void removeAllDynamicDictionaries() { notImplemented(); }
virtual bool windowIsKey() const;
virtual void setWindowIsKey(bool);
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (265324 => 265325)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2020-08-06 14:46:35 UTC (rev 265325)
@@ -155,6 +155,7 @@
{
cocoaResetStateToConsistentValues(options);
+ [UIKeyboard removeAllDynamicDictionaries];
[UIPasteboard generalPasteboard].items = @[ ];
[[UIApplication sharedApplication] _cancelAllTouches];
[[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];
Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.h (265324 => 265325)
--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.h 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.h 2020-08-06 14:46:35 UTC (rev 265325)
@@ -118,7 +118,6 @@
JSObjectRef selectionCaretViewRect() const override;
JSObjectRef selectionRangeViewRects() const override;
JSObjectRef inputViewBounds() const override;
- void removeAllDynamicDictionaries() override;
JSRetainPtr<JSStringRef> scrollingTreeAsText() const override;
JSObjectRef propertiesOfLayerWithID(uint64_t layerID) const override;
void simulateRotation(DeviceOrientation*, JSValueRef) override;
Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (265324 => 265325)
--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2020-08-06 14:28:42 UTC (rev 265324)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2020-08-06 14:46:35 UTC (rev 265325)
@@ -843,11 +843,6 @@
return JSValueToObject(m_context->jsContext(), [JSValue valueWithObject:toNSDictionary(webView()._inputViewBounds) inContext:[JSContext contextWithJSGlobalContextRef:m_context->jsContext()]].JSValueRef, nullptr);
}
-void UIScriptControllerIOS::removeAllDynamicDictionaries()
-{
- [UIKeyboard removeAllDynamicDictionaries];
-}
-
JSRetainPtr<JSStringRef> UIScriptControllerIOS::scrollingTreeAsText() const
{
return adopt(JSStringCreateWithCFString((CFStringRef)[webView() _scrollingTreeAsText]));
