Changeset 234614 in webkit

Timestamp:

Aug 6, 2018 12:31:06 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[iOS] Caret disappears after resigning and becoming first responder if active focus state is retained
​https://bugs.webkit.org/show_bug.cgi?id=188322
<rdar://problem/42455270>

Reviewed by Tim Horton.

Fixes an API test added in r234600, which had incorrect test expectations — namely, the width of the caret rect
was not in content view coordinates, unlike the x, y, and height.

• TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:

(rounded):
(-[TestWKWebView waitForCaretViewFrameToBecome:]):
(-[TestWKWebView waitForSelectionViewRectsToBecome:]):
(TestWebKitAPI::TEST):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2018-08-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] Caret disappears after resigning and becoming first responder if active focus state is retained
+        https://bugs.webkit.org/show_bug.cgi?id=188322
+        <rdar://problem/42455270>
+
+        Reviewed by Tim Horton.
+
+        Fixes an API test added in r234600, which had incorrect test expectations — namely, the width of the caret rect
+        was not in content view coordinates, unlike the x, y, and height.
+
+        * TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
+        (rounded):
+        (-[TestWKWebView waitForCaretViewFrameToBecome:]):
+        (-[TestWKWebView waitForSelectionViewRectsToBecome:]):
+        (TestWebKitAPI::TEST):
+
 2018-08-06  Ryan Haddad  <ryanhaddad@apple.com>
 

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

@@ -37 +37 @@
 @implementation TestWKWebView (KeyboardInputTests)
 
+static CGRect rounded(CGRect rect)
+{
+    return CGRectMake(roundl(rect.origin.x), roundl(rect.origin.y), roundl(rect.size.width), roundl(rect.size.height));
+}
+
 - (void)waitForCaretViewFrameToBecome:(CGRect)frame
 {
@@ -43 +48 @@
     NSTimeInterval startTime = [NSDate timeIntervalSinceReferenceDate];
     while ([[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]]) {
-        CGRect currentFrame = self.caretViewRectInContentCoordinates;
+        CGRect currentFrame = rounded(self.caretViewRectInContentCoordinates);
         if (CGRectEqualToRect(currentFrame, frame))
             break;
@@ -65 +70 @@
         if (currentRects.count == selectionRects.count) {
             for (NSUInteger index = 0; index < selectionRects.count; ++index)
-                selectionRectsMatch |= [selectionRects[index] isEqualToValue:currentRects[index]];
+                selectionRectsMatch |= CGRectEqualToRect(selectionRects[index].CGRectValue, rounded(currentRects[index].CGRectValue));
         } else
             selectionRectsMatch = NO;
@@ -125 +130 @@
 TEST(KeyboardInputTests, CaretSelectionRectAfterRestoringFirstResponder)
 {
-    auto expectedCaretRect = CGRectMake(16, 13, 3, 15);
+    auto expectedCaretRect = CGRectMake(16, 13, 2, 15);
     auto webView = webViewWithAutofocusedInput();
     EXPECT_WK_STREQ("INPUT", [webView stringByEvaluatingJavaScript:@"document.activeElement.tagName"]);