webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 7 deletions

diff --git a/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp b/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp
index 0087aa301..2e304e28c 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/TextInputController.cpp
@@ -30,13 +30,13 @@
 #include "InjectedBundlePage.h"
 #include "JSTextInputController.h"
 #include "StringFunctions.h"
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace WTR {
 
-PassRefPtr<TextInputController> TextInputController::create()
+Ref<TextInputController> TextInputController::create()
 {
-    return adoptRef(new TextInputController);
+    return adoptRef(*new TextInputController);
 }
 
 TextInputController::TextInputController()
@@ -59,22 +59,22 @@ void TextInputController::makeWindowObject(JSContextRef context, JSObjectRef win
 
 void TextInputController::setMarkedText(JSStringRef text, int from, int length)
 {
-    WKBundlePageSetComposition(InjectedBundle::shared().page()->page(), toWK(text).get(), from, length);
+    WKBundlePageSetComposition(InjectedBundle::singleton().page()->page(), toWK(text).get(), from, length);
 }
 
 bool TextInputController::hasMarkedText()
 {
-    return WKBundlePageHasComposition(InjectedBundle::shared().page()->page());
+    return WKBundlePageHasComposition(InjectedBundle::singleton().page()->page());
 }
 
 void TextInputController::unmarkText()
 {
-    WKBundlePageConfirmComposition(InjectedBundle::shared().page()->page());
+    WKBundlePageConfirmComposition(InjectedBundle::singleton().page()->page());
 }
 
 void TextInputController::insertText(JSStringRef text)
 {
-    WKBundlePageConfirmCompositionWithText(InjectedBundle::shared().page()->page(), toWK(text).get());
+    WKBundlePageConfirmCompositionWithText(InjectedBundle::singleton().page()->page(), toWK(text).get());
 }
 
 } // namespace WTR