Changeset 120274 in webkit

Timestamp:

Jun 13, 2012 9:08:17 PM (12 years ago)

Author:

hbono@chromium.org

Message:

[chromium] Add WebFrame::replaceMisspelledRange
​https://bugs.webkit.org/show_bug.cgi?id=88618

Reviewed by Kent Tamura.

This change adds WebFrame::replaceMisspelledRange, which replaces the range of a
misspelled marker with text so Chromium can use it for replacing misspelled
words with suggetions.

• public/WebFrame.h:

(WebFrame):

• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::replaceMisspelledRange):
(WebKit):

• src/WebFrameImpl.h:

(WebFrameImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebFrame.h (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)
• src/WebFrameImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-13  Hironori Bono  <hbono@chromium.org>
+
+        [chromium] Add WebFrame::replaceMisspelledRange
+        https://bugs.webkit.org/show_bug.cgi?id=88618
+
+        Reviewed by Kent Tamura.
+
+        This change adds WebFrame::replaceMisspelledRange, which replaces the range of a
+        misspelled marker with text so Chromium can use it for replacing misspelled
+        words with suggetions.
+
+        * public/WebFrame.h:
+        (WebFrame):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::replaceMisspelledRange):
+        (WebKit):
+        * src/WebFrameImpl.h:
+        (WebFrameImpl):
+
 2012-06-13  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebFrame.h

@@ -435 +435 @@
     virtual bool isContinuousSpellCheckingEnabled() const = 0;
     virtual void requestTextChecking(const WebElement&) = 0;
+    virtual void replaceMisspelledRange(const WebString&) = 0;
 
     // Selection -----------------------------------------------------------

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

@@ -1345 +1345 @@
 }
 
+void WebFrameImpl::replaceMisspelledRange(const WebString& text)
+{
+    // If this caret selection has two or more markers, this function replace the range covered by the first marker with the specified word as Microsoft Word does.
+    if (pluginContainerFromFrame(frame()))
+        return;
+    RefPtr<Range> caretRange = frame()->selection()->toNormalizedRange();
+    if (!caretRange)
+        return;
+    Vector<DocumentMarker*> markers = frame()->document()->markers()->markersInRange(caretRange.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
+    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()))
+        return;
+    frame()->selection()->setSelection(markerRange.get(), CharacterGranularity);
+    frame()->editor()->replaceSelectionWithText(text, false, true);
+}
+
 bool WebFrameImpl::hasSelection() const
 {

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

@@ -172 +172 @@
     virtual bool isContinuousSpellCheckingEnabled() const;
     virtual void requestTextChecking(const WebElement&);
+    virtual void replaceMisspelledRange(const WebString&);
     virtual bool hasSelection() const;
     virtual WebRange selectionRange() const;