Changeset 141519 in webkit

Timestamp:

Jan 31, 2013 6:05:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebKit/chromium: [Chromium] Select multi-word misspelling on context click
​https://bugs.webkit.org/show_bug.cgi?id=108509

Patch by Rouslan Solomakhin <​rouslan@chromium.org> on 2013-01-31
Reviewed by Tony Chang.

• src/ContextMenuClientImpl.cpp:

(WebKit):
(WebKit::selectMisspellingAsync): Added utility function to get the misspelling for asynchronous spellcheck.
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): Select multi-word misspelling on context click.

Tools: [Chromium] Suggest 'uppercase' for multi-word misspelling 'upper case'
​https://bugs.webkit.org/show_bug.cgi?id=108509

Patch by Rouslan Solomakhin <​rouslan@chromium.org> on 2013-01-31
Reviewed by Tony Chang.

• DumpRenderTree/chromium/TestRunner/src/MockSpellCheck.cpp:

(append): Added utility function to append WebString to WebVector.
(MockSpellCheck::fillSuggestionList): Suggest 'uppercase' for misspelling 'upper case'.

LayoutTests: [Chromium] Expect spellcheck to select multi-word misspelling on context click
​https://bugs.webkit.org/show_bug.cgi?id=108509

Patch by Rouslan Solomakhin <​rouslan@chromium.org> on 2013-01-31
Reviewed by Tony Chang.

• editing/spelling/spelling-exactly-selected-multiple-words.html: Check spelling suggestion for multi-word misspelling.
• editing/spelling/spelling-should-select-multiple-words.html: Check spelling suggestion for multi-word misspelling.
• editing/spelling/spelling-exactly-selected-multiple-words-expected.txt:
• editing/spelling/spelling-should-select-multiple-words-expected.txt:
• platform/chromium/TestExpectations: Expect spellcheck to select multi-word misspelling on context click

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/spelling/spelling-exactly-selected-multiple-words-expected.txt (modified) (1 diff)
• LayoutTests/editing/spelling/spelling-exactly-selected-multiple-words.html (modified) (1 diff)
• LayoutTests/editing/spelling/spelling-should-select-multiple-words-expected.txt (modified) (1 diff)
• LayoutTests/editing/spelling/spelling-should-select-multiple-words.html (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (modified) (4 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/TestRunner/src/MockSpellCheck.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-31  Rouslan Solomakhin  <rouslan@chromium.org>
+
+        [Chromium] Expect spellcheck to select multi-word misspelling on context click
+        https://bugs.webkit.org/show_bug.cgi?id=108509
+
+        Reviewed by Tony Chang.
+
+        * editing/spelling/spelling-exactly-selected-multiple-words.html: Check spelling suggestion for multi-word misspelling.
+        * editing/spelling/spelling-should-select-multiple-words.html: Check spelling suggestion for multi-word misspelling.
+        * editing/spelling/spelling-exactly-selected-multiple-words-expected.txt:
+        * editing/spelling/spelling-should-select-multiple-words-expected.txt:
+        * platform/chromium/TestExpectations: Expect spellcheck to select multi-word misspelling on context click
+
 2013-01-31  Christopher Cameron  <ccameron@chromium.org>
 

trunk/LayoutTests/editing/spelling/spelling-exactly-selected-multiple-words-expected.txt

@@ -9 +9 @@
 PASS spellingMarkerRange.toString() is "upper case"
 PASS window.getSelection().toString() is "upper case"
+PASS contextMenuElements[contextMenuElements.length - 1] is "uppercase"
 PASS successfullyParsed is true
 

trunk/LayoutTests/editing/spelling/spelling-exactly-selected-multiple-words.html

@@ -40 +40 @@
     shouldBeEqualToString("spellingMarkerRange.toString()", "upper case");
     shouldBeEqualToString("window.getSelection().toString()", "upper case");
+    shouldBeEqualToString("contextMenuElements[contextMenuElements.length - 1]", "uppercase");
 });
 

trunk/LayoutTests/editing/spelling/spelling-should-select-multiple-words-expected.txt

@@ -8 +8 @@
 PASS spellingMarkerRange.toString() is "upper case"
 PASS window.getSelection().toString() is "upper case"
+PASS contextMenuElements[contextMenuElements.length - 1] is "uppercase"
 PASS successfullyParsed is true
 

trunk/LayoutTests/editing/spelling/spelling-should-select-multiple-words.html

@@ -31 +31 @@
     shouldBeEqualToString("spellingMarkerRange.toString()", "upper case");
     shouldBeEqualToString("window.getSelection().toString()", "upper case");
+    shouldBeEqualToString("contextMenuElements[contextMenuElements.length - 1]", "uppercase");
 });
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -4358 +4358 @@
 webkit.org/b/108370 editing/spelling/spelling-double-clicked-word.html [ Failure ]
 webkit.org/b/108370 editing/spelling/spelling-double-clicked-word-with-underscores.html [ Failure ]
-webkit.org/b/108370 editing/spelling/spelling-should-select-multiple-words.html [ Failure ]
 webkit.org/b/108370 editing/spelling/spelling-with-punctuation-selection.html [ Failure ]
 webkit.org/b/108370 editing/spelling/spelling-with-underscore-selection.html [ Failure ]

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-31  Rouslan Solomakhin  <rouslan@chromium.org>
+
+        [Chromium] Select multi-word misspelling on context click
+        https://bugs.webkit.org/show_bug.cgi?id=108509
+
+        Reviewed by Tony Chang.
+
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit):
+        (WebKit::selectMisspellingAsync): Added utility function to get the misspelling for asynchronous spellcheck.
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): Select multi-word misspelling on context click.
+
 2013-01-31  Florin Malita  <fmalita@chromium.org>
 

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

@@ -41 +41 @@
 #include "Editor.h"
 #include "EventHandler.h"
+#include "ExceptionCodePlaceholder.h"
 #include "FrameLoader.h"
 #include "FrameView.h"
@@ -103 +104 @@
 
 // Helper function to get misspelled word on which context menu
-// is to be evolked. This function also sets the word on which context menu
-// has been evoked to be the selected word, as required. This function changes
+// is to be invoked. This function also sets the word on which context menu
+// has been invoked to be the selected word, as required. This function changes
 // the selection only when there were no selected characters on OS X.
 static String selectMisspelledWord(const ContextMenu* defaultMenu, Frame* selectedFrame)
@@ -142 +143 @@
 #endif
     return misspelledWord;
+}
+
+static String selectMisspellingAsync(Frame* selectedFrame, Vector<DocumentMarker*>& markers)
+{
+    VisibleSelection selection = selectedFrame->selection()->selection();
+    if (!selection.isCaretOrRange())
+        return String();
+
+    // Caret and range selections always return valid normalized ranges.
+    RefPtr<Range> selectionRange = selection.toNormalizedRange();
+    markers.append(selectedFrame->document()->markers()->markersInRange(selectionRange.get(), DocumentMarker::Spelling | DocumentMarker::Grammar));
+    if (markers.size() != 1)
+        return String();
+
+    // Cloning a range fails only for invalid ranges.
+    RefPtr<Range> markerRange = selectionRange->cloneRange(ASSERT_NO_EXCEPTION);
+    markerRange->setStart(markerRange->startContainer(), markers[0]->startOffset());
+    markerRange->setEnd(markerRange->endContainer(), markers[0]->endOffset());
+    if (selection.isCaret()) {
+        selection = VisibleSelection(markerRange.get());
+        selectedFrame->selection()->setSelection(selection, WordGranularity);
+        selectionRange = selection.toNormalizedRange();
+    }
+
+    if (!WebCore::areRangesEqual(markerRange.get(), selectionRange.get()))
+        return String();
+
+    return markerRange->text();
 }
 
@@ -275 +304 @@
         // 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.
+        // a mouse on a word, Chrome just needs to find a spelling marker on the word instead of spellchecking it.
         if (selectedFrame->settings() && selectedFrame->settings()->asynchronousSpellCheckingEnabled()) {
-            VisibleSelection selection = selectedFrame->selection()->selection();
-            bool shouldUpdateSelection = false;
-            if (selection.isCaretOrRange()) {
-                if (selection.isCaret()) {
-                    selection.expandUsingGranularity(WordGranularity);
-                    shouldUpdateSelection = true;
-                }
-                RefPtr<Range> range = selection.toNormalizedRange();
-                Vector<DocumentMarker*> markers = selectedFrame->document()->markers()->markersInRange(range.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
-                if (markers.size() == 1) {
-                    if (markers[0]->startOffset() != static_cast<unsigned>(range->startOffset()) || markers[0]->endOffset() != static_cast<unsigned>(range->endOffset()))
-                        markers.clear();
-                }
-                if (markers.size() == 1) {
-                    range->setStart(range->startContainer(), markers[0]->startOffset());
-                    range->setEnd(range->endContainer(), markers[0]->endOffset());
-                    data.misspelledWord = range->text();
-                    if (markers[0]->description().length()) {
-                        Vector<String> suggestions;
-                        markers[0]->description().split('\n', suggestions);
-                        data.dictionarySuggestions = suggestions;
-                    } else if (m_webView->spellCheckClient()) {
-                        int misspelledOffset, misspelledLength;
-                        m_webView->spellCheckClient()->spellCheck(data.misspelledWord, misspelledOffset, misspelledLength, &data.dictionarySuggestions);
-                    }
-                    selection = VisibleSelection(range.get());
-                    if (shouldUpdateSelection && selectedFrame->selection()->shouldChangeSelection(selection))
-                        selectedFrame->selection()->setSelection(selection, WordGranularity);
-                }
+            Vector<DocumentMarker*> markers;
+            data.misspelledWord = selectMisspellingAsync(selectedFrame, markers);
+            if (markers.size() == 1 && markers[0]->description().length()) {
+                Vector<String> suggestions;
+                markers[0]->description().split('\n', suggestions);
+                data.dictionarySuggestions = suggestions;
+            } else if (m_webView->spellCheckClient()) {
+                int misspelledOffset, misspelledLength;
+                m_webView->spellCheckClient()->spellCheck(data.misspelledWord, misspelledOffset, misspelledLength, &data.dictionarySuggestions);
             }
         } else {

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-31  Rouslan Solomakhin  <rouslan@chromium.org>
+
+        [Chromium] Suggest 'uppercase' for multi-word misspelling 'upper case'
+        https://bugs.webkit.org/show_bug.cgi?id=108509
+
+        Reviewed by Tony Chang.
+
+        * DumpRenderTree/chromium/TestRunner/src/MockSpellCheck.cpp:
+        (append): Added utility function to append WebString to WebVector.
+        (MockSpellCheck::fillSuggestionList): Suggest 'uppercase' for misspelling 'upper case'.
+
 2013-01-31  David Farler  <dfarler@apple.com>
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockSpellCheck.cpp

@@ -37 +37 @@
 
 using namespace WebKit;
+
+static void append(WebVector<WebString>* data, const WebString& item)
+{
+    WebVector<WebString> result(data->size() + 1);
+    for (size_t i = 0; i < data->size(); ++i)
+        result[i] = (*data)[i];
+    result[data->size()] = item;
+    data->swap(result);
+}
 
 MockSpellCheck::MockSpellCheck()
@@ -108 +117 @@
 void MockSpellCheck::fillSuggestionList(const WebString& word, WebVector<WebString>* suggestions)
 {
-    if (word == WebString::fromUTF8("wellcome")) {
-        WebVector<WebString> result(suggestions->size() + 1);
-        for (size_t i = 0; i < suggestions->size(); ++i)
-            result[i] = (*suggestions)[i];
-        result[suggestions->size()] = WebString::fromUTF8("welcome");
-        suggestions->swap(result);
-    }
+    if (word == WebString::fromUTF8("wellcome"))
+        append(suggestions, WebString::fromUTF8("welcome"));
+    else if (word == WebString::fromUTF8("upper case"))
+        append(suggestions, WebString::fromUTF8("uppercase"));
 }