Changeset 224201 in webkit

Timestamp:

Oct 30, 2017 2:24:37 PM (6 years ago)

Author:

Megan Gardner

Message:

Correctly determine affinity when inserting text via Keyboard Suggestions
​https://bugs.webkit.org/show_bug.cgi?id=178969

Reviewed by Ryosuke Niwa.

Source/WebCore:

There has been talk about renaming these enums, but in the meantime we should at least have a comment
clarifying what they actually mean.

No new tests only adding a comment, no tests needed.

• editing/TextAffinity.h:

Source/WebKit:

Use the logic of VisiblePosition to correctly determine cursor affinity. We were
defaulting to upstream, but that in incorrect and resulted in hitting asserts that
we should not. This should give us the correct affinity in all cases.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::syncApplyAutocorrection):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TextAffinity.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-27  Megan Gardner  <megan_gardner@apple.com>
+
+        Correctly determine affinity when inserting text via Keyboard Suggestions
+        https://bugs.webkit.org/show_bug.cgi?id=178969
+
+        Reviewed by Ryosuke Niwa.
+
+        There has been talk about renaming these enums, but in the meantime we should at least have a comment 
+        clarifying what they actually mean.
+
+        No new tests only adding a comment, no tests needed.
+
+        * editing/TextAffinity.h:
+
 2017-10-27  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/editing/TextAffinity.h

@@ -27 +27 @@
 
 namespace WebCore {
-
+// UPSTREAM means before a line break DOWNSTREAM mean after a line break
 enum EAffinity { UPSTREAM = 0, DOWNSTREAM = 1 };
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-27  Megan Gardner  <megan_gardner@apple.com>
+
+        Correctly determine affinity when inserting text via Keyboard Suggestions
+        https://bugs.webkit.org/show_bug.cgi?id=178969
+
+        Reviewed by Ryosuke Niwa.
+
+        Use the logic of VisiblePosition to correctly determine cursor affinity. We were
+        defaulting to upstream, but that in incorrect and resulted in hitting asserts that
+        we should not. This should give us the correct affinity in all cases.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::syncApplyAutocorrection):
+
 2017-10-30  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -1858 +1858 @@
     }
     
-    frame.selection().setSelectedRange(range.get(), UPSTREAM, true);
+    // Correctly determine affinity, using logic currently only present in VisiblePosition
+    EAffinity affinity = DOWNSTREAM;
+    if (range && range->collapsed())
+        affinity = VisiblePosition(range->startPosition(), UPSTREAM).affinity();
+    
+    frame.selection().setSelectedRange(range.get(), affinity, true);
     if (correction.length())
         frame.editor().insertText(correction, 0, originalText.isEmpty() ? TextEventInputKeyboard : TextEventInputAutocompletion);