[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 52b17887fb27c5602eb891da62623aaebe02efdc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 18:11:24 2010 +0000

    2010-10-01  Jia Pu  <jpu at apple.com>
    
            Reviewed by Darin Adler.
    
            Autocorrection shouldn't prompt the same correction after user has edited previous correction.
            https://bugs.webkit.org/show_bug.cgi?id=46839
            <rdar://problem/8476963>
    
            * editing/Editor.cpp:
            (WebCore::Editor::respondToChangedSelection): Remove "CorrectionIndicator" marker instead of
              "Replacement" marker. Since the former controls whether we draw autocorrection underline,
              and the latter is used to prevent autocorrection from being applied again on already auto-
              corrected word. So the "Replacement" shouldn't be removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03b6677..445cbad 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-01  Jia Pu  <jpu at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Autocorrection shouldn't prompt the same correction after user has edited previous correction.
+        https://bugs.webkit.org/show_bug.cgi?id=46839
+        <rdar://problem/8476963>
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::respondToChangedSelection): Remove "CorrectionIndicator" marker instead of
+          "Replacement" marker. Since the former controls whether we draw autocorrection underline,
+          and the latter is used to prevent autocorrection from being applied again on already auto-
+          corrected word. So the "Replacement" shouldn't be removed.
+
 2010-10-01  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 63c466e..ee15237 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -3600,7 +3600,7 @@ void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, boo
         // Perhaps peculiar, but it matches AppKit.
         if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange()) {
             m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
-            m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::Replacement);
+            m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::CorrectionIndicator);
         }
         if (RefPtr<Range> sentenceRange = newSelectedSentence.toNormalizedRange())
             m_frame->document()->markers()->removeMarkers(sentenceRange.get(), DocumentMarker::Grammar);

-- 
WebKit Debian packaging