Changeset 68243 in webkit

Timestamp:

Sep 24, 2010 1:44:24 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-24 Jia Pu <​jpu@apple.com>

Reviewed by Shinichiro Hamaji.

Need to remove autocorrection underlines in current line when newline is entered.
​https://bugs.webkit.org/show_bug.cgi?id=45709
<rdar://problem/8335576>

This change affects only Mac OSX build.

• dom/DocumentMarker.h: Added "CorrectionIndicator" to indicate the words on which we need to draw autocorrection underline. We cannot use existing "Replacement" for this purpose, since it is not meant to be removed once it is added. But we need to remove all autocorrection underlines when a line break or paragraph separator is inserted, which is the behavior in NSTextView. Hence we need a separate marker value for drawing autocorrection underline.

• editing/Editor.cpp: (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Add "CorrectionIndicator" when autocorrection takes place. (WebCore::Editor::changeSelectionAfterCommand): Remove "CorrectionIndicator" markers if the command results in inserting paragraph separator.

• rendering/InlineTextBox.cpp: (WebCore::textCheckingLineStyleForMarkerType): Use "CorrectionIndicator" marker instead of "Replacement" to draw autocorrection underline. (WebCore::InlineTextBox::paintDocumentMarkers): Ditto.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-24  Jia Pu  <jpu@apple.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Need to remove autocorrection underlines in current line when newline is entered.
+        https://bugs.webkit.org/show_bug.cgi?id=45709
+        <rdar://problem/8335576>
+
+        This change affects only Mac OSX build.
+
+        * dom/DocumentMarker.h: Added "CorrectionIndicator" to indicate the words on which we need
+          to draw autocorrection underline. We cannot use existing "Replacement" for this purpose,
+          since it is not meant to be removed once it is added. But we need to remove all autocorrection
+          underlines when a line break or paragraph separator is inserted, which is the behavior in
+          NSTextView. Hence we need a separate marker value for drawing autocorrection underline.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Add "CorrectionIndicator" when
+          autocorrection takes place.
+        (WebCore::Editor::changeSelectionAfterCommand): Remove "CorrectionIndicator" markers if the
+          command results in inserting paragraph separator.
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::textCheckingLineStyleForMarkerType): Use "CorrectionIndicator" marker instead of
+          "Replacement" to draw autocorrection underline.
+        (WebCore::InlineTextBox::paintDocumentMarkers): Ditto.
+
 2010-09-24  Eric Uhrhane  <ericu@chromium.org>
 

trunk/WebCore/dom/DocumentMarker.h

@@ -41 +41 @@
         TextMatch,
         Replacement,
+        CorrectionIndicator,
         RejectedCorrection
     };

trunk/WebCore/editing/Editor.cpp

@@ -2742 +2742 @@
                             RefPtr<Range> replacedRange = TextIterator::subrange(paragraphRange.get(), resultLocation, replacementLength);
                             replacedRange->startContainer()->document()->markers()->addMarker(replacedRange.get(), DocumentMarker::Replacement, replacedString);
+                            replacedRange->startContainer()->document()->markers()->addMarker(replacedRange.get(), DocumentMarker::CorrectionIndicator);
                         }
                     }
@@ -3122 +3123 @@
     if (newSelection.start().isOrphan() || newSelection.end().isOrphan())
         return;
+
+#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+    // Check to see if the command introduced paragraph separator. If it did, we remove existing autocorrection underlines.
+    // This is in consistency with the behavior in AppKit
+    if (!inSameParagraph(m_frame->selection()->selection().visibleStart(), newSelection.visibleEnd()))
+        m_frame->document()->markers()->removeMarkers(DocumentMarker::CorrectionIndicator);
+#endif
 
     // If there is no selection change, don't bother sending shouldChangeSelection, but still call setSelection,

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -776 +776 @@
     case DocumentMarker::Grammar:
         return GraphicsContext::TextCheckingGrammarLineStyle;
-    case DocumentMarker::Replacement:
+    case DocumentMarker::CorrectionIndicator:
         return GraphicsContext::TextCheckingReplacementLineStyle;
     default:
@@ -914 +914 @@
             case DocumentMarker::Spelling:
             case DocumentMarker::Replacement:
+            case DocumentMarker::CorrectionIndicator:
             case DocumentMarker::RejectedCorrection:
                 if (background)
@@ -947 +948 @@
                 paintTextMatchMarker(pt, tx, ty, marker, style, font);
                 break;
-            case DocumentMarker::Replacement:
+            case DocumentMarker::CorrectionIndicator:
                 computeRectForReplacementMarker(tx, ty, marker, style, font);
                 paintSpellingOrGrammarMarker(pt, tx, ty, marker, style, font, false);
                 break;
+            case DocumentMarker::Replacement:
             case DocumentMarker::RejectedCorrection:
                 break;