DO NOT SUBMIT

Source/WebKit/chromium/public/WebWidget.h

Index: Source/WebKit/chromium/public/WebWidget.h
diff --git a/Source/WebKit/chromium/public/WebWidget.h b/Source/WebKit/chromium/public/WebWidget.h
index 36fbf313ad17464c41d8d927cb2132adab6ae881..2b908082c445e0d08c80df1c5aba94c0665af689 100644
--- a/Source/WebKit/chromium/public/WebWidget.h
+++ b/Source/WebKit/chromium/public/WebWidget.h
@@ -40,6 +40,7 @@
 namespace WebKit {
 
 class WebInputEvent;
+class WebRange;
 class WebString;
 struct WebRect;
 struct WebSize;
@@ -119,6 +120,10 @@ public:
     // Returns true if there is an ongoing composition or the text is inserted.
     virtual bool confirmComposition(const WebString& text) = 0;
 
+    // Returns the character range of the current composition. This is also
+    // referred to as the marked range.
+    virtual bool compositionRange(unsigned* location, unsigned* length) = 0;
+
     // Returns the current text input type of this WebWidget.
     virtual WebTextInputType textInputType() = 0;
 
@@ -126,6 +131,11 @@ public:
     // will be returned if a selection range is available.
     virtual WebRect caretOrSelectionBounds() = 0;
 
+    // Returns the current selection range of this WebWidget. If there is no
+    // selection, it will return a 0-length range with the location at the
+    // caret.
+    virtual bool caretOrSelectionRange(unsigned* location, unsigned* length) = 0;
+
     // Changes the text direction of the selected input node.
     virtual void setTextDirection(WebTextDirection) = 0;