Changeset 80405 in webkit

Timestamp:

Mar 4, 2011, 9:20:23 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-04 Jia Pu <​jpu@apple.com>

Reviewed by Darin Adler.

Those checking in Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited() should be done with VisiblePosition::isNull().
​https://bugs.webkit.org/show_bug.cgi?id=55731

No new tests. There's no behavioral change.

This patch improved clarity and readability of Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited().

• editing/Editor.cpp: (WebCore::Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-04  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Those checking in Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited() should be done with VisiblePosition::isNull().
+        https://bugs.webkit.org/show_bug.cgi?id=55731
+
+        No new tests. There's no behavioral change.
+
+        This patch improved clarity and readability of Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited().
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::removeSpellAndCorrectionMarkersFromWordsToBeEdited):
+
 2011-03-04  John Bauman  <jbauman@chromium.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2691 +2691 @@
     VisiblePosition endOfLastWord = endOfWord(endOfSelection, RightWordIfOnBoundary);
 
-    // This can be the case if the end of selection is at the end of document.
-    if (endOfLastWord.deepEquivalent().anchorType() != Position::PositionIsOffsetInAnchor) {
-        startOfLastWord = startOfWord(frame()->selection()->selection().start(), LeftWordIfOnBoundary);
-        endOfLastWord = endOfWord(frame()->selection()->selection().start(), LeftWordIfOnBoundary);
+    if (startOfFirstWord.isNull()) {
+        startOfFirstWord = startOfWord(startOfSelection, RightWordIfOnBoundary);
+        endOfFirstWord = endOfWord(startOfSelection, RightWordIfOnBoundary);
+    }
+    
+    if (endOfLastWord.isNull()) {
+        startOfLastWord = startOfWord(endOfSelection, LeftWordIfOnBoundary);
+        endOfLastWord = endOfWord(endOfSelection, LeftWordIfOnBoundary);
     }
 
@@ -2701 +2705 @@
     if (doNotRemoveIfSelectionAtWordBoundary && endOfFirstWord == startOfSelection) {
         startOfFirstWord = nextWordPosition(startOfFirstWord);
-        if (startOfFirstWord.isNull() || startOfFirstWord == endOfSelection)
-            return;
         endOfFirstWord = endOfWord(startOfFirstWord, RightWordIfOnBoundary);
-        if (endOfFirstWord.deepEquivalent().anchorType() != Position::PositionIsOffsetInAnchor)
+        if (startOfFirstWord == endOfSelection)
             return;
     }
@@ -2713 +2715 @@
         startOfLastWord = previousWordPosition(startOfLastWord);
         endOfLastWord = endOfWord(startOfLastWord, RightWordIfOnBoundary);
-        if (endOfLastWord == startOfFirstWord)
+        if (endOfLastWord == startOfSelection)
             return;
     }
+
+    if (startOfFirstWord.isNull() || endOfFirstWord.isNull() || startOfLastWord.isNull() || endOfLastWord.isNull())
+        return;
 
     // Now we remove markers on everything between startOfFirstWord and endOfLastWord.