Changeset 113405 in webkit

Timestamp:

Apr 5, 2012 7:48:37 PM (12 years ago)

Author:

hbono@chromium.org

Message:

[Chromium] moving a cursor on a misspelled word should not remove a misspelled underline
​https://bugs.webkit.org/show_bug.cgi?id=83214

Reviewed by Ryosuke Niwa.

When Chrome enables asynchronous spellchecking, it adds Spelling markers in the
background. For this case, moving a cursor should not remove these markers
because it requires Chrome to spellcheck text again. This change prevents
removing Spelling markers added by spellcheckers asynchronously.

Source/WebCore:

Test: platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html

• editing/Editor.cpp:

(WebCore::Editor::respondToChangedSelection):

Source/WebKit/chromium:

• src/ContextMenuClientImpl.cpp:

(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): use marker descriptions instead of spellchecking text when Chrome enables asynchronous spellchecking.

LayoutTests:

• platform/chromium/editing/spelling/move-cursor-to-misspelled-word-expected.txt: Added.
• platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/editing/spelling/move-cursor-to-misspelled-word-expected.txt (added)
• LayoutTests/platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-05  Hironori Bono  <hbono@chromium.org>
+
+        [Chromium] moving a cursor on a misspelled word should not remove a misspelled underline
+        https://bugs.webkit.org/show_bug.cgi?id=83214
+
+        Reviewed by Ryosuke Niwa.
+
+        When Chrome enables asynchronous spellchecking, it adds Spelling markers in the
+        background. For this case, moving a cursor should not remove these markers
+        because it requires Chrome to spellcheck text again. This change prevents
+        removing Spelling markers added by spellcheckers asynchronously.
+
+        * platform/chromium/editing/spelling/move-cursor-to-misspelled-word-expected.txt: Added.
+        * platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html: Added.
+
 2012-04-05  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-05  Hironori Bono  <hbono@chromium.org>
+
+        [Chromium] moving a cursor on a misspelled word should not remove a misspelled underline
+        https://bugs.webkit.org/show_bug.cgi?id=83214
+
+        Reviewed by Ryosuke Niwa.
+
+        When Chrome enables asynchronous spellchecking, it adds Spelling markers in the
+        background. For this case, moving a cursor should not remove these markers
+        because it requires Chrome to spellcheck text again. This change prevents
+        removing Spelling markers added by spellcheckers asynchronously.
+
+        Test: platform/chromium/editing/spelling/move-cursor-to-misspelled-word.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::respondToChangedSelection):
+
 2012-04-05  Hans Muller  <hmuller@adobe.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2924 +2924 @@
 
 #if !PLATFORM(MAC) || (PLATFORM(MAC) && (defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)))
+#if PLATFORM(CHROMIUM)
+        if (!m_frame->settings() || !m_frame->settings()->asynchronousSpellCheckingEnabled()) {
+            if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
+                m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
+        }
+#else
         // This only erases markers that are in the first unit (word or sentence) of the selection.
         // Perhaps peculiar, but it matches AppKit on these Mac OS X versions.
         if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
             m_frame->document()->markers()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
+#endif
 #endif
         if (RefPtr<Range> sentenceRange = newSelectedSentence.toNormalizedRange())

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-04-05  Hironori Bono  <hbono@chromium.org>
+
+        [Chromium] moving a cursor on a misspelled word should not remove a misspelled underline
+        https://bugs.webkit.org/show_bug.cgi?id=83214
+
+        Reviewed by Ryosuke Niwa.
+
+        When Chrome enables asynchronous spellchecking, it adds Spelling markers in the
+        background. For this case, moving a cursor should not remove these markers
+        because it requires Chrome to spellcheck text again. This change prevents
+        removing Spelling markers added by spellcheckers asynchronously.
+
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): use marker descriptions instead of spellchecking text when Chrome enables asynchronous spellchecking.
+
 2012-04-05  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -38 +38 @@
 #include "Document.h"
 #include "DocumentLoader.h"
+#include "DocumentMarkerController.h"
 #include "Editor.h"
 #include "EventHandler.h"
@@ -55 +56 @@
 #include "PlatformString.h"
 #include "RenderWidget.h"
+#include "Settings.h"
 #include "TextBreakIterator.h"
 #include "Widget.h"
@@ -273 +275 @@
         }  
 #endif
-        if (m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled()) {
+        // When Chrome enables asynchronous spellchecking, its spellchecker adds spelling markers to misspelled
+        // words and attaches suggestions to these markers in the background. Therefore, when a user right-clicks
+        // a mouse on a word, Chrome just needs to find a spelling marker on the word instread of spellchecking it.
+        if (selectedFrame->settings() && selectedFrame->settings()->asynchronousSpellCheckingEnabled()) {
+            RefPtr<Range> range = selectedFrame->selection()->toNormalizedRange();
+            Vector<DocumentMarker*> markers = selectedFrame->document()->markers()->markersInRange(range.get(), DocumentMarker::Spelling);
+            if (!markers.isEmpty()) {
+                Vector<String> suggestions;
+                for (size_t i = 0; i < markers.size(); ++i) {
+                    if (!markers[i]->description().isEmpty()) {
+                        Vector<String> descriptions;
+                        markers[i]->description().split('\n', descriptions);
+                        suggestions.append(descriptions);
+                    }
+                }
+                data.dictionarySuggestions = suggestions;
+                data.misspelledWord = range->text();
+            }
+        } else if (m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled()) {
             data.isSpellCheckingEnabled = true;
             // Spellchecking might be enabled for the field, but could be disabled on the node.