Title: [265345] trunk
Revision
265345
Author
wenson_hs...@apple.com
Date
2020-08-06 13:21:06 -0700 (Thu, 06 Aug 2020)

Log Message

Unreviewed, reverting r265325.

Caused several tests in fast/forms and editing/pasteboard to
time out

Reverted changeset:

"Remove UIScriptController.removeAllDynamicDictionaries()"
https://bugs.webkit.org/show_bug.cgi?id=215207
https://trac.webkit.org/changeset/265325

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (265344 => 265345)


--- trunk/LayoutTests/ChangeLog	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/LayoutTests/ChangeLog	2020-08-06 20:21:06 UTC (rev 265345)
@@ -1,3 +1,16 @@
+2020-08-06  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        Unreviewed, reverting r265325.
+
+        Caused several tests in fast/forms and editing/pasteboard to
+        time out
+
+        Reverted changeset:
+
+        "Remove UIScriptController.removeAllDynamicDictionaries()"
+        https://bugs.webkit.org/show_bug.cgi?id=215207
+        https://trac.webkit.org/changeset/265325
+
 2020-08-06  Alicia Boya GarcĂ­a  <ab...@igalia.com>
 
         Unreviewed GStreamer MSE micro gardening

Modified: trunk/LayoutTests/fast/events/ios/contenteditable-autocorrect.html (265344 => 265345)


--- trunk/LayoutTests/fast/events/ios/contenteditable-autocorrect.html	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/LayoutTests/fast/events/ios/contenteditable-autocorrect.html	2020-08-06 20:21:06 UTC (rev 265345)
@@ -32,6 +32,7 @@
             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 (265344 => 265345)


--- trunk/Tools/ChangeLog	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/Tools/ChangeLog	2020-08-06 20:21:06 UTC (rev 265345)
@@ -1,3 +1,16 @@
+2020-08-06  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        Unreviewed, reverting r265325.
+
+        Caused several tests in fast/forms and editing/pasteboard to
+        time out
+
+        Reverted changeset:
+
+        "Remove UIScriptController.removeAllDynamicDictionaries()"
+        https://bugs.webkit.org/show_bug.cgi?id=215207
+        https://trac.webkit.org/changeset/265325
+
 2020-08-06  David Kilzer  <ddkil...@apple.com>
 
         WTF::makeString() should handle enum values

Modified: trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (265344 => 265345)


--- trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl	2020-08-06 20:21:06 UTC (rev 265345)
@@ -311,6 +311,7 @@
     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 (265344 => 265345)


--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h	2020-08-06 20:21:06 UTC (rev 265345)
@@ -186,6 +186,7 @@
     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 (265344 => 265345)


--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm	2020-08-06 20:21:06 UTC (rev 265345)
@@ -155,7 +155,6 @@
 {
     cocoaResetStateToConsistentValues(options);
 
-    [UIKeyboard removeAllDynamicDictionaries];
     [UIPasteboard generalPasteboard].items = @[ ];
     [[UIApplication sharedApplication] _cancelAllTouches];
     [[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];

Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.h (265344 => 265345)


--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.h	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.h	2020-08-06 20:21:06 UTC (rev 265345)
@@ -118,6 +118,7 @@
     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 (265344 => 265345)


--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm	2020-08-06 20:09:15 UTC (rev 265344)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm	2020-08-06 20:21:06 UTC (rev 265345)
@@ -843,6 +843,11 @@
     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]));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to