Changeset 69548 in webkit

Timestamp:

Oct 11, 2010 6:21:14 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-11 Jia Pu <​jpu@apple.com>

Reviewed by Adele Peterson.

Should commit pending autocorrection before next round of text checking.
​https://bugs.webkit.org/show_bug.cgi?id=46986
<rdar://problem/8424535>

1. Apply pending autocorrection before calling markAllMisspellingsAndBadGrammarInRanges().
2. Remove unneccessary calls to dismissCorrectionPanel(), since the panel is dismissed when selection changes, which occurs after every typing command.

• editing/Editor.cpp: (WebCore::Editor::markMisspellingsAfterTypingToPosition): Apply pending autocorrection. (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Store current correction replacement in m_correctionReplacementString. (WebCore::Editor::startCorrectionPanelTimer): Remove call to dismissCorrectionPanel().
• editing/Editor.h: Add m_correctionReplacementString to store proposed autocorrection string.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-11  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        Should commit pending autocorrection before next round of text checking.
+        https://bugs.webkit.org/show_bug.cgi?id=46986
+        <rdar://problem/8424535>
+
+        1. Apply pending autocorrection before calling markAllMisspellingsAndBadGrammarInRanges().
+        2. Remove unneccessary calls to dismissCorrectionPanel(), since the panel is dismissed when
+           selection changes, which occurs after every typing command.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::markMisspellingsAfterTypingToPosition): Apply pending autocorrection.
+        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Store current correction replacement
+          in m_correctionReplacementString.
+        (WebCore::Editor::startCorrectionPanelTimer): Remove call to dismissCorrectionPanel().
+        * editing/Editor.h: Add m_correctionReplacementString to store proposed autocorrection string.
+
 2010-10-11  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/editing/Editor.cpp

@@ -2405 +2405 @@
 {
 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+    // Apply pending autocorrection before next round of spell checking.
+    bool didApplyCorrection = false;
+    if (m_rangeToBeReplacedByCorrection) {
+        ExceptionCode ec = 0;
+        RefPtr<Range> paragraphRangeContainingCorrection = m_rangeToBeReplacedByCorrection->cloneRange(ec);
+        if (!ec) {
+            setStart(paragraphRangeContainingCorrection.get(), startOfParagraph(m_rangeToBeReplacedByCorrection->startPosition()));
+            setEnd(paragraphRangeContainingCorrection.get(), endOfParagraph(m_rangeToBeReplacedByCorrection->endPosition()));
+            // After we replace the word at range m_rangeToBeReplacedByCorrection, we need to add 
+            // autocorrection underline at that range. However, once the replacement took place, the
+            // value of m_rangeToBeReplacedByCorrection is not valid anymore. So before we carry out
+            // the replacement, we need to store the start position of m_rangeToBeReplacedByCorrection
+            // relative to the start position of the containing paragraph. We use correctionStartOffsetInParagraph
+            // to store this value. In order to obtain this offset, we need to first create a range
+            // which spans from the start of paragraph to the start position of m_rangeToBeReplacedByCorrection.
+            RefPtr<Range> correctionStartOffsetInParagraphAsRange = Range::create(paragraphRangeContainingCorrection->startContainer(ec)->document(), paragraphRangeContainingCorrection->startPosition(), paragraphRangeContainingCorrection->startPosition());
+            if (!ec) {
+                Position startPositionOfRangeToBeReplaced = m_rangeToBeReplacedByCorrection->startPosition();
+                correctionStartOffsetInParagraphAsRange->setEnd(startPositionOfRangeToBeReplaced.containerNode(), startPositionOfRangeToBeReplaced.computeOffsetInContainerNode(), ec);
+                if (!ec) {
+                    // Take note of the location of autocorrection so that we can add marker after the replacement took place.
+                    int correctionStartOffsetInParagraph = TextIterator::rangeLength(correctionStartOffsetInParagraphAsRange.get());
+                    Position caretPosition = m_frame->selection()->selection().end();
+                    RefPtr<Range> rangeToBeReplaced = m_rangeToBeReplacedByCorrection->cloneRange(ec);
+                    VisibleSelection selectionToReplace(rangeToBeReplaced.get(), DOWNSTREAM);
+                    if (m_frame->selection()->shouldChangeSelection(selectionToReplace)) {
+                        m_frame->selection()->setSelection(selectionToReplace);
+                        replaceSelectionWithText(m_correctionReplacementString, false, false);
+                        caretPosition.moveToOffset(caretPosition.offsetInContainerNode() + m_correctionReplacementString.length() - m_stringToBeReplacedByCorrection.length());
+                        RefPtr<Range> replacementRange = TextIterator::subrange(paragraphRangeContainingCorrection.get(), correctionStartOffsetInParagraph, m_correctionReplacementString.length());
+                        replacementRange->startContainer()->document()->markers()->addMarker(replacementRange.get(), DocumentMarker::Replacement, m_correctionReplacementString);
+                        replacementRange->startContainer()->document()->markers()->addMarker(replacementRange.get(), DocumentMarker::CorrectionIndicator);
+                        m_frame->selection()->moveTo(caretPosition, false);
+                        didApplyCorrection = true;
+                    }
+                }
+            }
+        }
+        m_rangeToBeReplacedByCorrection.release();
+    }
+#endif
+
     TextCheckingOptions textCheckingOptions = 0;
     if (isContinuousSpellCheckingEnabled())
@@ -2755 +2798 @@
                         m_rangeToBeReplacedByCorrection = rangeToReplace;
                         m_stringToBeReplacedByCorrection = replacedString;
+                        m_correctionReplacementString = result->replacement;
                         client()->showCorrectionPanel(totalBoundingBox, m_stringToBeReplacedByCorrection, result->replacement, this);
                         doReplacement = false;
@@ -2766 +2810 @@
                             selectionOffset += replacementLength - resultLength;
                         if (result->type == TextCheckingTypeCorrection) {
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-                            if (client())
-                                client()->dismissCorrectionPanel(true);
-#endif
                             // Add a marker so that corrections can easily be undone and won't be re-corrected.
                             RefPtr<Range> replacedRange = TextIterator::subrange(paragraphRange.get(), resultLocation, replacementLength);
@@ -2858 +2898 @@
 #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     static const double correctionPanelTimerInterval = 0.3;
-    if (client())
-        client()->dismissCorrectionPanel(true);
     if (isAutomaticSpellingCorrectionEnabled())
         m_correctionPanelTimer.startOneShot(correctionPanelTimerInterval);

trunk/WebCore/editing/Editor.h

@@ -380 +380 @@
     RefPtr<Range> m_rangeToBeReplacedByCorrection;
     String m_stringToBeReplacedByCorrection;
+    String m_correctionReplacementString;
     Timer<Editor> m_correctionPanelTimer;
     VisibleSelection m_mark;