Changeset 243712 in webkit

Timestamp:

Apr 1, 2019, 2:08:31 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Make UIWKDocumentContext rects per-character instead of per-word
​https://bugs.webkit.org/show_bug.cgi?id=196459

Reviewed by Wenson Hsieh.

Source/WebCore:

No new tests; adjusted expected results of WebKit.DocumentEditingContext.

• editing/TextIterator.cpp:

(WebCore::CharacterIterator::CharacterIterator):

• editing/TextIterator.h:

(WebCore::CharacterIterator::atEnd const):
(WebCore::CharacterIterator::text const):
Add WEBCORE_EXPORT to some things.
Introduce a CharacterIterator constructor that takes Positions, like one that TextIterator has.
Move initializers to the header.

Source/WebKit:

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::requestDocumentEditingContext):
Switch to CharacterIterator instead of TextIterator directly, to get
per-character rects as the API requests.

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:

(TEST):
Adjust test results due to switching to per-character rects.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/TextIterator.cpp (modified) (1 diff)
• Source/WebCore/editing/TextIterator.h (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-01  Tim Horton  <timothy_horton@apple.com>
+
+        Make UIWKDocumentContext rects per-character instead of per-word
+        https://bugs.webkit.org/show_bug.cgi?id=196459
+
+        Reviewed by Wenson Hsieh.
+
+        No new tests; adjusted expected results of WebKit.DocumentEditingContext.
+
+        * editing/TextIterator.cpp:
+        (WebCore::CharacterIterator::CharacterIterator):
+        * editing/TextIterator.h:
+        (WebCore::CharacterIterator::atEnd const):
+        (WebCore::CharacterIterator::text const):
+        Add WEBCORE_EXPORT to some things.
+        Introduce a CharacterIterator constructor that takes Positions, like one that TextIterator has.
+        Move initializers to the header.
+
 2019-04-01  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -1529 +1529 @@
 CharacterIterator::CharacterIterator(const Range& range, TextIteratorBehavior behavior)
     : m_underlyingIterator(&range, behavior)
-    , m_offset(0)
-    , m_runOffset(0)
-    , m_atBreak(true)
+{
+    while (!atEnd() && !m_underlyingIterator.text().length())
+        m_underlyingIterator.advance();
+}
+
+CharacterIterator::CharacterIterator(Position start, Position end, TextIteratorBehavior behavior)
+    : m_underlyingIterator(start, end, behavior)
 {
     while (!atEnd() && !m_underlyingIterator.text().length())

trunk/Source/WebCore/editing/TextIterator.h

@@ -256 +256 @@
 public:
     explicit CharacterIterator(const Range&, TextIteratorBehavior = TextIteratorDefaultBehavior);
-    
+    WEBCORE_EXPORT explicit CharacterIterator(Position start, Position end, TextIteratorBehavior = TextIteratorDefaultBehavior);
+    
+    bool atEnd() const { return m_underlyingIterator.atEnd(); }
+    WEBCORE_EXPORT void advance(int numCharacters);
+    
+    StringView text() const { return m_underlyingIterator.text().substring(m_runOffset); }
+    WEBCORE_EXPORT Ref<Range> range() const;
+
+    bool atBreak() const { return m_atBreak; }
+    int characterOffset() const { return m_offset; }
+
+private:
+    TextIterator m_underlyingIterator;
+
+    int m_offset { 0 };
+    int m_runOffset { 0 };
+    bool m_atBreak { true };
+};
+    
+class BackwardsCharacterIterator {
+public:
+    explicit BackwardsCharacterIterator(const Range&);
+
     bool atEnd() const { return m_underlyingIterator.atEnd(); }
     void advance(int numCharacters);
-    
-    StringView text() const { return m_underlyingIterator.text().substring(m_runOffset); }
+
     Ref<Range> range() const;
 
-    bool atBreak() const { return m_atBreak; }
-    int characterOffset() const { return m_offset; }
-
-private:
-    TextIterator m_underlyingIterator;
+private:
+    SimplifiedBackwardsTextIterator m_underlyingIterator;
 
     int m_offset;
@@ -273 +291 @@
     bool m_atBreak;
 };
-    
-class BackwardsCharacterIterator {
-public:
-    explicit BackwardsCharacterIterator(const Range&);
-
-    bool atEnd() const { return m_underlyingIterator.atEnd(); }
-    void advance(int numCharacters);
-
-    Ref<Range> range() const;
-
-private:
-    SimplifiedBackwardsTextIterator m_underlyingIterator;
-
-    int m_offset;
-    int m_runOffset;
-    bool m_atBreak;
-};
 
 // Similar to the TextIterator, except that the chunks of text returned are "well behaved", meaning

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-01  Tim Horton  <timothy_horton@apple.com>
+
+        Make UIWKDocumentContext rects per-character instead of per-word
+        https://bugs.webkit.org/show_bug.cgi?id=196459
+
+        Reviewed by Wenson Hsieh.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::requestDocumentEditingContext):
+        Switch to CharacterIterator instead of TextIterator directly, to get
+        per-character rects as the API requests.
+
 2019-04-01  Chris Dumez  <cdumez@apple.com>
 

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

@@ -3519 +3519 @@
 
     if (wantsRects) {
-        TextIterator contextIterator(contextBeforeStart.deepEquivalent(), contextAfterEnd.deepEquivalent());
+        CharacterIterator contextIterator(contextBeforeStart.deepEquivalent(), contextAfterEnd.deepEquivalent());
         unsigned currentLocation = 0;
         while (!contextIterator.atEnd()) {
             unsigned length = contextIterator.text().length();
             if (!length) {
-                contextIterator.advance();
+                contextIterator.advance(1);
                 continue;
             }
@@ -3530 +3530 @@
             DocumentEditingContext::TextRectAndRange rect;
             rect.rect = contextIterator.range()->absoluteBoundingBox();
-            rect.range = { currentLocation, length };
+            rect.range = { currentLocation, 1 };
             context.textRects.append(rect);
 
-            currentLocation += length;
-            contextIterator.advance();
+            currentLocation++;
+            contextIterator.advance(1);
         }
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-01  Tim Horton  <timothy_horton@apple.com>
+
+        Make UIWKDocumentContext rects per-character instead of per-word
+        https://bugs.webkit.org/show_bug.cgi?id=196459
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:
+        (TEST):
+        Adjust test results due to switching to per-character rects.
+
 2019-04-01  Chris Dumez  <cdumez@apple.com>
 

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

@@ -207 +207 @@
     EXPECT_NULL(context.contextAfter);
 
-    NSArray<NSValue *> *rects = [context characterRectsForCharacterRange:NSMakeRange(0, 1)];
-    EXPECT_EQ(1UL, rects.count);
-    EXPECT_RECT_EQ(0, 0, 92, 24, rects.firstObject.CGRectValue);
+    NSArray<NSValue *> *rects = [[context characterRectsForCharacterRange:NSMakeRange(0, 4)] sortedArrayUsingComparator:^(NSValue *a, NSValue *b) {
+        return [@(a.CGRectValue.origin.x) compare:@(b.CGRectValue.origin.x)];
+    }];
+    EXPECT_EQ(4UL, rects.count);
+    EXPECT_RECT_EQ(0, 0, 23, 24, rects[0].CGRectValue);
+    EXPECT_RECT_EQ(23, 0, 23, 24, rects[1].CGRectValue);
+    EXPECT_RECT_EQ(46, 0, 23, 24, rects[2].CGRectValue);
+    EXPECT_RECT_EQ(69, 0, 23, 24, rects[3].CGRectValue);
     rects = [context characterRectsForCharacterRange:NSMakeRange(5, 1)];
     EXPECT_EQ(0UL, rects.count);
@@ -217 +222 @@
     rects = [context characterRectsForCharacterRange:NSMakeRange(0, 1)];
     EXPECT_EQ(1UL, rects.count);
-    EXPECT_RECT_EQ(0, 0, 92, 24, rects.firstObject.CGRectValue);
+    EXPECT_RECT_EQ(0, 0, 23, 24, rects.firstObject.CGRectValue);
     rects = [context characterRectsForCharacterRange:NSMakeRange(6, 1)];
     EXPECT_EQ(1UL, rects.count);
-    EXPECT_RECT_EQ(92, 0, 92, 24, rects.firstObject.CGRectValue);
+    EXPECT_RECT_EQ(138, 0, 23, 24, rects.firstObject.CGRectValue);
 
     // Text Input Context