Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

1 files changed, 5 insertions, 4 deletions

diff --git a/WebKitTools/DumpRenderTree/qt/TextInputControllerQt.h b/WebKitTools/DumpRenderTree/qt/TextInputControllerQt.h
index 7c7433e..0210984 100644
--- a/WebKitTools/DumpRenderTree/qt/TextInputControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/TextInputControllerQt.h
@@ -31,6 +31,7 @@
 
 #include <QList>
 #include <QObject>
+#include <QVariant>
 #include <QString>
 #include "qwebpage.h"
 
@@ -41,14 +42,14 @@ public:
 
 public slots:
     void doCommand(const QString& command);
-//     void setMarkedText(const QString& str, int from, int length);
+    void setMarkedText(const QString& string, int start, int end);
 //     bool hasMarkedText();
 //     void unmarkText();
 //     QList<int> markedRange();
-//     QList<int> selectedRange();
+    QVariantList selectedRange();
 //     void validAttributesForMarkedText();
-//     void inserText(const QString&);
-//     void firstRectForCharacterRange();
+    void insertText(const QString& string);
+    QVariantList firstRectForCharacterRange(int location, int length);
 //     void characterIndexForPoint(int, int);
 //     void substringFromRange(int, int);
 //     void conversationIdentifier();