Changeset 87823 in webkit

Timestamp:

Jun 1, 2011 10:41:25 AM (13 years ago)

Author:

xan@webkit.org

Message:

2011-06-01 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Utility methods for UA spellchecking
​https://bugs.webkit.org/show_bug.cgi?id=61788

Adds a couple of utility methods needed to implement some aspects
of spell checking support in a browser.

• webkit/webkitwebframe.cpp: (webkit_web_frame_replace_selection): method to replace the current selection with a string of text. (webkit_web_frame_get_range_for_word_around_caret): returns the DOM range for the word where the caret/selection currently is.
• webkit/webkitwebframe.h: declare new methods.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebframe.cpp (modified) (3 diffs)
• webkit/webkitwebframe.h (modified) (2 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-06-01  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Utility methods for UA spellchecking
+        https://bugs.webkit.org/show_bug.cgi?id=61788
+
+        Adds a couple of utility methods needed to implement some aspects
+        of spell checking support in a browser.
+
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_replace_selection): method to replace the current
+        selection with a string of text.
+        (webkit_web_frame_get_range_for_word_around_caret): returns the DOM
+        range for the word where the caret/selection currently is.
+        * webkit/webkitwebframe.h: declare new methods.
+
 2011-05-31  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -32 +32 @@
 #include "AnimationController.h"
 #include "DOMObjectCache.h"
+#include "DocumentFragment.h"
 #include "DocumentLoader.h"
 #include "DocumentLoaderGtk.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClientGtk.h"
+#include "FrameSelection.h"
 #include "FrameTree.h"
 #include "FrameView.h"
@@ -50 +52 @@
 #include "RenderTreeAsText.h"
 #include "RenderView.h"
+#include "ReplaceSelectionCommand.h"
 #include "ScriptController.h"
 #include "SubstituteData.h"
+#include "TextIterator.h"
+#include "markup.h"
+#include "webkit/WebKitDOMRangePrivate.h"
 #include "webkitenumtypes.h"
 #include "webkitglobalsprivate.h"
@@ -975 +981 @@
 }
 
+/**
+ * webkit_web_frame_replace_selection:
+ * @frame: a #WebKitWeFrame
+ * @text: the text to insert in place of the current selection
+ *
+ * Replaces the current selection in @frame, if any, with @text.
+ *
+ * Since: 1.5.1
+ **/
+void webkit_web_frame_replace_selection(WebKitWebFrame* frame, const char* text)
+{
+    Frame* coreFrame = core(frame);
+    RefPtr<DocumentFragment> fragment = createFragmentFromText(
+        coreFrame->selection()->toNormalizedRange().get(), text);
+    applyCommand(ReplaceSelectionCommand::create(coreFrame->document(), fragment.get(),
+                                                 ReplaceSelectionCommand::SmartReplace | ReplaceSelectionCommand::MatchStyle | ReplaceSelectionCommand::PreventNesting));
+}
+
+/**
+ * webkit_web_frame_get_range_for_word_around_caret:
+ * @frame: a #WebKitWebFrame
+ *
+ * Returns a #WebKitDOMRange for the word where the caret is currently
+ * positioned.
+ *
+ * Returns: a #WebKitDOMRange spanning the word where the caret
+ * currently is positioned. If there is no caret %NULL will be
+ * returned.
+ *
+ * Since: 1.5.1.
+ **/
+WebKitDOMRange* webkit_web_frame_get_range_for_word_around_caret(WebKitWebFrame* frame)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), 0);
+
+    Frame* coreFrame = core(frame);
+    FrameSelection* selection = coreFrame->selection();
+    if (selection->isNone() || selection->isRange())
+        return 0;
+    VisibleSelection visibleSelection(selection->selection().visibleStart());
+    visibleSelection.expandUsingGranularity(WordGranularity);
+
+    return kit(visibleSelection.firstRange().get());
+}
+
 namespace WebKit {
 

trunk/Source/WebKit/gtk/webkit/webkitwebframe.h

@@ -28 +28 @@
 
 #include <webkit/webkitdefines.h>
+#include <webkit/webkitdomdefines.h>
 #include <webkit/webkitnetworkrequest.h>
 #include <webkit/webkitwebdatasource.h>
@@ -176 +177 @@
 webkit_web_frame_get_network_response        (WebKitWebFrame       *frame);
 
+WEBKIT_API void
+webkit_web_frame_replace_selection           (WebKitWebFrame        *frame,
+                                              const char            *text);
+
+WEBKIT_API WebKitDOMRange*
+webkit_web_frame_get_range_for_word_around_caret (WebKitWebFrame    *frame);
+
 G_END_DECLS