Changeset 84592 in webkit

Timestamp:

Apr 21, 2011 7:49:05 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Maciej Stachowiak.

[Mac] correctionPanelTimerFired() crashes due to rangeToBeReplaced being cleared.
​https://bugs.webkit.org/show_bug.cgi?id=59155
<rdar://problem/9261698>

Make sure the range isn't cleared before calling windowRectForRange() on it. Also removed unused functions in Editor.h,
and fixed a typo in function name.

• editing/Editor.h:
• editing/SpellingCorrectionController.cpp: (WebCore::SpellingCorrectionController::correctionPanelTimerFired): (WebCore::SpellingCorrectionController::respondToChangedSelection):
• editing/SpellingCorrectionController.h: (WebCore::SpellingCorrectionController::shouldStartTimerFor):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-21  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        [Mac] correctionPanelTimerFired() crashes due to rangeToBeReplaced being cleared.
+        https://bugs.webkit.org/show_bug.cgi?id=59155
+        <rdar://problem/9261698>
+
+        Make sure the range isn't cleared before calling windowRectForRange() on it. Also removed unused functions in Editor.h,
+        and fixed a typo in function name.
+
+        * editing/Editor.h:
+        * editing/SpellingCorrectionController.cpp:
+        (WebCore::SpellingCorrectionController::correctionPanelTimerFired):
+        (WebCore::SpellingCorrectionController::respondToChangedSelection):
+        * editing/SpellingCorrectionController.h:
+        (WebCore::SpellingCorrectionController::shouldStartTimerFor):
+
 2011-04-21  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Source/WebCore/editing/Editor.h

@@ -429 +429 @@
 
     Node* findEventTargetFromSelection() const;
-    void stopCorrectionPanelTimer();
-
-    void applyCorrectionPanelInfo(const Vector<DocumentMarker::MarkerType>& markerTypesToAdd);
-    // Return true if correction was applied, false otherwise.
-    bool applyAutocorrectionBeforeTypingIfAppropriate();
 };
 

trunk/Source/WebCore/editing/SpellingCorrectionController.cpp

@@ -293 +293 @@
         break;
     case CorrectionPanelInfo::PanelTypeReversion: {
+        if (!m_correctionPanelInfo.rangeToBeReplaced)
+            break;
         m_correctionPanelInfo.isActive = true;
         m_correctionPanelInfo.replacedString = plainText(m_correctionPanelInfo.rangeToBeReplaced.get());
@@ -301 +303 @@
         break;
     case CorrectionPanelInfo::PanelTypeSpellingSuggestions: {
-        if (plainText(m_correctionPanelInfo.rangeToBeReplaced.get()) != m_correctionPanelInfo.replacedString)
+        if (!m_correctionPanelInfo.rangeToBeReplaced || plainText(m_correctionPanelInfo.rangeToBeReplaced.get()) != m_correctionPanelInfo.replacedString)
             break;
         String paragraphText = plainText(TextCheckingParagraph(m_correctionPanelInfo.rangeToBeReplaced).paragraphRange().get());
@@ -398 +400 @@
     for (size_t i = 0; i < markerCount; ++i) {
         const DocumentMarker& marker = markers[i];
-        if (!shouldStartTimeFor(marker, endOffset))
+        if (!shouldStartTimerFor(marker, endOffset))
             continue;
         RefPtr<Range> wordRange = Range::create(m_frame->document(), node, marker.startOffset, node, marker.endOffset);

trunk/Source/WebCore/editing/SpellingCorrectionController.h

@@ -122 +122 @@
     void recordAutocorrectionResponseReversed(const String& replacedString, const String& replacementString);
 
-    bool shouldStartTimeFor(const DocumentMarker& marker, int endOffset) const
+    bool shouldStartTimerFor(const DocumentMarker& marker, int endOffset) const
     {
         return (((marker.type == DocumentMarker::Replacement && !marker.description.isNull())