Changeset 247679 in webkit

Timestamp:

Jul 21, 2019 8:35:38 PM (5 years ago)

Author:

Wenson Hsieh

Message:

[iOS] [WebKit2] Add limited support for -isPosition:atBoundary:inDirection: in WKContentView
​https://bugs.webkit.org/show_bug.cgi?id=199993
<rdar://problem/49523528>

Reviewed by Beth Dakin.

Source/WebKit:

Add support for -isPosition:atBoundary:inDirection:, only in the cases where the given position is the start or
and position and the given granularity is UITextGranularityParagraph.

Test: EditorStateTests.ParagraphBoundary

• Shared/EditorState.cpp:

(WebKit::EditorState::PostLayoutData::encode const):
(WebKit::EditorState::PostLayoutData::decode):

• Shared/EditorState.h:

Add a couple of bits to indicate whether the selection start or end positions are at paragraph boundaries.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView isPosition:atBoundary:inDirection:]):

Implement this to return selectionStartIsAtParagraphBoundary or selectionEndIsAtParagraphBoundary.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::platformEditorState const):

Tools:

Add a new API test to verify the behavior of -isPosition:atBoundary:inDirection:.

• TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm:

(TestWebKitAPI::TEST):

• TestWebKitAPI/cocoa/TestWKWebView.h:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/EditorState.cpp (modified) (2 diffs)
• Source/WebKit/Shared/EditorState.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm (modified) (1 diff)
• Tools/TestWebKitAPI/cocoa/TestWKWebView.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-21  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] [WebKit2] Add limited support for -isPosition:atBoundary:inDirection: in WKContentView
+        https://bugs.webkit.org/show_bug.cgi?id=199993
+        <rdar://problem/49523528>
+
+        Reviewed by Beth Dakin.
+
+        Add support for -isPosition:atBoundary:inDirection:, only in the cases where the given position is the start or
+        and position and the given granularity is UITextGranularityParagraph.
+
+        Test: EditorStateTests.ParagraphBoundary
+
+        * Shared/EditorState.cpp:
+        (WebKit::EditorState::PostLayoutData::encode const):
+        (WebKit::EditorState::PostLayoutData::decode):
+        * Shared/EditorState.h:
+
+        Add a couple of bits to indicate whether the selection start or end positions are at paragraph boundaries.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView isPosition:atBoundary:inDirection:]):
+
+        Implement this to return selectionStartIsAtParagraphBoundary or selectionEndIsAtParagraphBoundary.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::platformEditorState const):
+
 2019-07-20  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/EditorState.cpp

@@ -135 +135 @@
     encoder << caretColor;
     encoder << atStartOfSentence;
+    encoder << selectionStartIsAtParagraphBoundary;
+    encoder << selectionEndIsAtParagraphBoundary;
 #endif
 #if PLATFORM(MAC)
@@ -197 +199 @@
         return false;
     if (!decoder.decode(result.atStartOfSentence))
+        return false;
+    if (!decoder.decode(result.selectionStartIsAtParagraphBoundary))
+        return false;
+    if (!decoder.decode(result.selectionEndIsAtParagraphBoundary))
         return false;
 #endif

trunk/Source/WebKit/Shared/EditorState.h

@@ -113 +113 @@
         WebCore::Color caretColor;
         bool atStartOfSentence { false };
+        bool selectionStartIsAtParagraphBoundary { false };
+        bool selectionEndIsAtParagraphBoundary { false };
 #endif
 #if PLATFORM(MAC)

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -5070 +5070 @@
 - (BOOL)isPosition:(UITextPosition *)position atBoundary:(UITextGranularity)granularity inDirection:(UITextDirection)direction
 {
+    if (granularity == UITextGranularityParagraph) {
+        if (direction == UITextStorageDirectionBackward && [position isEqual:self.selectedTextRange.start])
+            return _page->editorState().postLayoutData().selectionStartIsAtParagraphBoundary;
+
+        if (direction == UITextStorageDirectionForward && [position isEqual:self.selectedTextRange.end])
+            return _page->editorState().postLayoutData().selectionEndIsAtParagraphBoundary;
+    }
+
     return NO;
 }

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -274 +274 @@
         }
         computeEditableRootHasContentAndPlainText(selection, postLayoutData);
+        postLayoutData.selectionStartIsAtParagraphBoundary = atBoundaryOfGranularity(selection.visibleStart(), TextGranularity::ParagraphGranularity, SelectionDirection::DirectionBackward);
+        postLayoutData.selectionEndIsAtParagraphBoundary = atBoundaryOfGranularity(selection.visibleEnd(), TextGranularity::ParagraphGranularity, SelectionDirection::DirectionForward);
     }
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-21  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] [WebKit2] Add limited support for -isPosition:atBoundary:inDirection: in WKContentView
+        https://bugs.webkit.org/show_bug.cgi?id=199993
+        <rdar://problem/49523528>
+
+        Reviewed by Beth Dakin.
+
+        Add a new API test to verify the behavior of -isPosition:atBoundary:inDirection:.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/cocoa/TestWKWebView.h:
+
 2019-07-21  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm

@@ -399 +399 @@
 }
 
+TEST(EditorStateTests, ParagraphBoundary)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
+    [webView synchronouslyLoadHTMLString:@"<body contenteditable><p>Hello world.</p></body>"];
+    [webView stringByEvaluatingJavaScript:@"document.body.focus()"];
+    [webView waitForNextPresentationUpdate];
+
+    auto textInput = [webView textInputContentView];
+    auto editor = adoptNS([[EditingTestHarness alloc] initWithWebView:webView.get()]);
+    [editor selectAll];
+
+    EXPECT_TRUE([textInput isPosition:textInput.selectedTextRange.start atBoundary:UITextGranularityParagraph inDirection:UITextStorageDirectionBackward]);
+    EXPECT_TRUE([textInput isPosition:textInput.selectedTextRange.end atBoundary:UITextGranularityParagraph inDirection:UITextStorageDirectionForward]);
+
+    [editor moveForward];
+    [editor moveBackward];
+    [editor moveBackward];
+
+    EXPECT_FALSE([textInput isPosition:textInput.selectedTextRange.start atBoundary:UITextGranularityParagraph inDirection:UITextStorageDirectionBackward]);
+    EXPECT_FALSE([textInput isPosition:textInput.selectedTextRange.end atBoundary:UITextGranularityParagraph inDirection:UITextStorageDirectionForward]);
+}
+
 #endif // PLATFORM(IOS_FAMILY)
 

trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.h

@@ -88 +88 @@
 
 @interface TestWKWebView (IOSOnly)
-@property (nonatomic, readonly) UIView <UITextInputPrivate, UITextInputInternal, UITextInputMultiDocument, UIWKInteractionViewProtocol> *textInputContentView;
+@property (nonatomic, readonly) UIView <UITextInputPrivate, UITextInputInternal, UITextInputMultiDocument, UIWKInteractionViewProtocol, UITextInputTokenizer> *textInputContentView;
 @property (nonatomic, readonly) RetainPtr<NSArray> selectionRectsAfterPresentationUpdate;
 @property (nonatomic, readonly) CGRect caretViewRectInContentCoordinates;