Changeset 79936 in webkit

Timestamp:

Feb 28, 2011 3:50:27 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-28 Jia Pu <​jpu@apple.com>

Reviewed by Darin Adler.

[Mac] Make "Change back to …" contextual menu item work with new autocorrection.
​https://bugs.webkit.org/show_bug.cgi?id=55396
<rdar://problem/8836093>

The change in InlineTextBox.cpp fixes a bug, where the rectangle of Replacement marker isn't
calculated. We need this to do hit test when deciding whether to show "Change back to ..." on
contextual menu.

The change in Editor.cpp is for notifying spellchecker about the reversion whenever "Change
back to ..." is clicked.

• editing/Editor.cpp: (WebCore::Editor::changeBackToReplacedString):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paintDocumentMarkers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Darin Adler.
+
+        [Mac] Make "Change back to …" contextual menu item work with new autocorrection.
+        https://bugs.webkit.org/show_bug.cgi?id=55396
+        <rdar://problem/8836093>
+
+        The change in InlineTextBox.cpp fixes a bug, where the rectangle of Replacement marker isn't
+        calculated. We need this to do hit test when deciding whether to show "Change back to ..." on
+        contextual menu.
+
+        The change in Editor.cpp is for notifying spellchecker about the reversion whenever "Change
+        back to ..." is clicked.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::changeBackToReplacedString):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintDocumentMarkers):
+
 2011-02-28  Victoria Kirst  <vrk@google.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2495 +2495 @@
         return;
     
+#if SUPPORT_AUTOCORRECTION_PANEL
+    String replacement = plainText(selection.get());
+    client()->recordAutocorrectionResponse(EditorClient::AutocorrectionReverted, replacedString, replacement);
+#endif
     TextCheckingParagraph paragraph(selection);
     replaceSelectionWithText(replacedString, false, false);
     RefPtr<Range> changedRange = paragraph.subrange(paragraph.checkingStart(), replacedString.length());
     changedRange->startContainer()->document()->markers()->addMarker(changedRange.get(), DocumentMarker::Replacement, String());
+#if SUPPORT_AUTOCORRECTION_PANEL
+    changedRange->startContainer()->document()->markers()->addMarker(changedRange.get(), DocumentMarker::SpellCheckingExemption);
+#endif
 }
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -1059 +1059 @@
             case DocumentMarker::Spelling:
             case DocumentMarker::CorrectionIndicator:
+            case DocumentMarker::Replacement:
                 if (background)
                     continue;
@@ -1091 +1092 @@
                 break;
             case DocumentMarker::CorrectionIndicator:
+                paintSpellingOrGrammarMarker(pt, boxOrigin, marker, style, font, false);
+                break;
+            case DocumentMarker::Replacement:
                 computeRectForReplacementMarker(marker, style, font);
-                paintSpellingOrGrammarMarker(pt, boxOrigin, marker, style, font, false);
                 break;
             default: