Changeset 120586 in webkit

Timestamp:

Jun 18, 2012 4:09:33 AM (12 years ago)

Author:

hbono@chromium.org

Message:

[chromium] Spellchecker should show suggestions only when right-clicking a misspelled word.
​https://bugs.webkit.org/show_bug.cgi?id=89331

Reviewed by Hajime Morita.

When a selection includes two or more misspelled words, it is not so easy to
select one word from them and to show its suggestions. To avoid this problem,
this change shows suggestions only when the selection is collapsed. For this
case, we can use Range::setStart and setEnd to convert a DocumentMarker to a
Range.

• src/ContextMenuClientImpl.cpp:

(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): Added a check that the selection is collapsed.

• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::replaceMisspelledRange): Added a check that the selection is collapsed. Also, use Range::setStart() and Range::setEnd() to get the marker range to emulate the behavior of DocumentMarker::markersInRange().

Location:

trunk/Source/WebKit/chromium

Files:

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-18  Hironori Bono  <hbono@chromium.org>
+
+        [chromium] Spellchecker should show suggestions only when right-clicking a misspelled word.
+        https://bugs.webkit.org/show_bug.cgi?id=89331
+
+        Reviewed by Hajime Morita.
+
+        When a selection includes two or more misspelled words, it is not so easy to
+        select one word from them and to show its suggestions. To avoid this problem,
+        this change shows suggestions only when the selection is collapsed. For this
+        case, we can use Range::setStart and setEnd to convert a DocumentMarker to a
+        Range.
+
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): Added a check that the selection is collapsed.
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::replaceMisspelledRange): Added a check that the selection is collapsed. Also, use Range::setStart() and Range::setEnd() to get the marker range to emulate the behavior of DocumentMarker::markersInRange().
+
 2012-06-14  Kinuko Yasuda  <kinuko@chromium.org>
 

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

@@ -280 +280 @@
         if (selectedFrame->settings() && selectedFrame->settings()->asynchronousSpellCheckingEnabled()) {
             RefPtr<Range> range = selectedFrame->selection()->toNormalizedRange();
-            if (range.get()) {
+            if (range.get() && range->collapsed()) {
                 Vector<DocumentMarker*> markers = selectedFrame->document()->markers()->markersInRange(range.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
                 if (!markers.isEmpty()) {

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

@@ -1356 +1356 @@
     if (markers.size() < 1 || markers[0]->startOffset() >= markers[0]->endOffset())
         return;
-    RefPtr<Range> markerRange = TextIterator::rangeFromLocationAndLength(frame()->selection()->rootEditableElementOrDocumentElement(), markers[0]->startOffset(), markers[0]->endOffset() - markers[0]->startOffset());
-    if (!markerRange.get() || !frame()->selection()->shouldChangeSelection(markerRange.get()))
+    caretRange->setStart(caretRange->firstNode(), markers[0]->startOffset());
+    caretRange->setEnd(caretRange->firstNode(), markers[0]->endOffset());
+    if (!frame()->selection()->shouldChangeSelection(caretRange.get()))
         return;
-    frame()->selection()->setSelection(markerRange.get(), CharacterGranularity);
+    frame()->selection()->setSelection(caretRange.get(), CharacterGranularity);
     frame()->editor()->replaceSelectionWithText(text, false, true);
 }