Changeset 120810 in webkit

Timestamp:

Jun 20, 2012 12:00:34 AM (12 years ago)

Author:

hbono@chromium.org

Message:

[chromium] Select the marker range when right-clicking on a marker.
​https://bugs.webkit.org/show_bug.cgi?id=89331

Reviewed by Hajime Morita.

Chromium always selects only one word when right-clicking on a spelling marker.
This prevents selecting whole region specified by a marker if the marker
consists of two or more words. This change retrieves a range coverted by a
marker and select the range. This emulates the behavior of Mac Chromium and it
does not need any workarounds for Mac.

• src/ContextMenuClientImpl.cpp:

(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/ContextMenuClientImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-20  Hironori Bono  <hbono@chromium.org>
+
+        [chromium] Select the marker range when right-clicking on a marker.
+        https://bugs.webkit.org/show_bug.cgi?id=89331
+
+        Reviewed by Hajime Morita.
+
+        Chromium always selects only one word when right-clicking on a spelling marker.
+        This prevents selecting whole region specified by a marker if the marker
+        consists of two or more words. This change retrieves a range coverted by a
+        marker and select the range. This emulates the behavior of Mac Chromium and it
+        does not need any workarounds for Mac.
+
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+
 2012-06-19  Kenneth Russell  <kbr@google.com>
 

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

@@ -279 +279 @@
         // 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();
-            if (range.get()) {
+            VisibleSelection selection = selectedFrame->selection()->selection();
+            if (selection.isCaretOrRange()) {
+                if (selection.isCaret())
+                    selection.expandUsingGranularity(WordGranularity);
+                RefPtr<Range> range = selection.toNormalizedRange();
                 Vector<DocumentMarker*> markers = selectedFrame->document()->markers()->markersInRange(range.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
-                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.misspelledWord = selectMisspelledWord(defaultMenu, selectedFrame);
-                    if (!suggestions.isEmpty())
+                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()) {
+                    } else if (m_webView->spellCheckClient()) {
                         int misspelledOffset, misspelledLength;
                         m_webView->spellCheckClient()->spellCheck(data.misspelledWord, misspelledOffset, misspelledLength, &data.dictionarySuggestions);
                     }
+                    selection = VisibleSelection(range.get());
+                    if (selectedFrame->selection()->shouldChangeSelection(selection))
+                        selectedFrame->selection()->setSelection(selection, WordGranularity);
                 }
             }