1 files changed, 7 insertions, 28 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
index 248d07284..bd214f3b6 100644
--- a/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
@@ -212,6 +212,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
 {
     if (wasEventHandled)
         return;
+    if (event.isFakeEventForComposition())
+        return;
 
     WebKitWebViewBase* webkitWebViewBase = WEBKIT_WEB_VIEW_BASE(m_viewWidget);
     webkitWebViewBaseForwardNextKeyEvent(webkitWebViewBase);
@@ -229,7 +231,7 @@ PassRefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPagePr
 }
 
 #if ENABLE(INPUT_TYPE_COLOR)
-PassRefPtr<WebColorChooserProxy> PageClientImpl::createColorChooserProxy(WebPageProxy*, const WebCore::Color&, const WebCore::IntRect&)
+PassRefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy*, const WebCore::Color&, const WebCore::IntRect&)
 {
     notImplemented();
     return 0;
@@ -258,47 +260,24 @@ void PageClientImpl::updateAcceleratedCompositingMode(const LayerTreeContext&)
 }
 #endif // USE(ACCELERATED_COMPOSITING)
 
-void PageClientImpl::didCommitLoadForMainFrame(bool useCustomRepresentation)
-{
-}
-
-void PageClientImpl::didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&)
-{
-}
-
-double PageClientImpl::customRepresentationZoomFactor()
-{
-    notImplemented();
-    return 0;
-}
-
-void PageClientImpl::setCustomRepresentationZoomFactor(double)
-{
-    notImplemented();
-}
-
 void PageClientImpl::pageClosed()
 {
     notImplemented();
 }
 
-void PageClientImpl::didChangeScrollbarsForMainFrame() const
-{
-}
-
-void PageClientImpl::flashBackingStoreUpdates(const Vector<IntRect>&)
+void PageClientImpl::preferencesDidChange()
 {
     notImplemented();
 }
 
-void PageClientImpl::findStringInCustomRepresentation(const String&, FindOptions, unsigned)
+void PageClientImpl::flashBackingStoreUpdates(const Vector<IntRect>&)
 {
     notImplemented();
 }
 
-void PageClientImpl::countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned)
+void PageClientImpl::updateTextInputState()
 {
-    notImplemented();
+    webkitWebViewBaseUpdateTextInputState(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
 }
 
 void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)