Changeset 248496 in webkit

Timestamp:

Aug 9, 2019 9:00:23 PM (5 years ago)

Author:

Wenson Hsieh

Message:

KeyboardInputTests.CaretSelectionRectAfterRestoringFirstResponder API tests time out on iPad
​https://bugs.webkit.org/show_bug.cgi?id=200604
<rdar://problem/51273130>

Reviewed by Megan Gardner.

Tweak some API tests so that they work on iPad simulator. These tests checked that the final caret rect was
{{16, 13}, {2, 15}}; however, this is only correct behavior on iPhone, where we will scale the page so that the
focused element's font size is legible. Note that when the page is scaled, we scale the height but not the
width of the caret, which is why the width of the caret (in content coordinates) decreases while the height
remains the same.

We don't have the same behavior on iPad, so the expected caret rect is {{16, 13}, {3, 15}}, which is equal to
the caret rect at initial scale 1.

• TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-09  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        KeyboardInputTests.CaretSelectionRectAfterRestoringFirstResponder API tests time out on iPad
+        https://bugs.webkit.org/show_bug.cgi?id=200604
+        <rdar://problem/51273130>
+
+        Reviewed by Megan Gardner.
+
+        Tweak some API tests so that they work on iPad simulator. These tests checked that the final caret rect was
+        {{16, 13}, {2, 15}}; however, this is only correct behavior on iPhone, where we will scale the page so that the
+        focused element's font size is legible. Note that when the page is scaled, we scale the height but not the
+        width of the caret, which is why the width of the caret (in content coordinates) decreases while the height
+        remains the same.
+
+        We don't have the same behavior on iPad, so the expected caret rect is {{16, 13}, {3, 15}}, which is equal to
+        the caret rect at initial scale 1.
+
+        * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
+
 2019-08-09  Ali Juma  <ajuma@chromium.org>
 

trunk/Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm

@@ -326 +326 @@
 TEST(KeyboardInputTests, CaretSelectionRectAfterRestoringFirstResponderWithRetainActiveFocusedState)
 {
-    auto expectedCaretRect = CGRectMake(16, 13, 2, 15);
+    // This difference in caret width is due to the fact that we don't zoom in to the input field on iPad, but do on iPhone.
+    auto expectedCaretRect = CGRectMake(16, 13, UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad ? 3 : 2, 15);
     auto webView = webViewWithAutofocusedInput();
     EXPECT_WK_STREQ("INPUT", [webView stringByEvaluatingJavaScript:@"document.activeElement.tagName"]);
@@ -361 +362 @@
 TEST(KeyboardInputTests, CaretSelectionRectAfterRestoringFirstResponder)
 {
-    auto expectedCaretRect = CGRectMake(16, 13, 2, 15);
+    // This difference in caret width is due to the fact that we don't zoom in to the input field on iPad, but do on iPhone.
+    auto expectedCaretRect = CGRectMake(16, 13, UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad ? 3 : 2, 15);
     auto webView = webViewWithAutofocusedInput();
     EXPECT_WK_STREQ("INPUT", [webView stringByEvaluatingJavaScript:@"document.activeElement.tagName"]);