From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 7 May 2012 11:21:11 +0200
Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b
 (http://svn.webkit.org/repository/webkit/trunk@116286)

---
 Source/WebKit2/UIProcess/qt/QtPageClient.h | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'Source/WebKit2/UIProcess/qt/QtPageClient.h')

diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.h b/Source/WebKit2/UIProcess/qt/QtPageClient.h
index f09db8243..e33dadf61 100644
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.h
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.h
@@ -21,24 +21,24 @@
 #ifndef QtPageClient_h
 #define QtPageClient_h
 
-#include "DrawingAreaProxy.h"
-#include "LayerTreeContext.h"
 #include "PageClient.h"
-#include "ShareableBitmap.h"
-#include "ViewportArguments.h"
 
-class QtWebPageEventHandler;
-class QtWebUndoController;
 class QQuickWebView;
 
-using namespace WebKit;
+namespace WebKit {
+
+class DrawingAreaProxy;
+class LayerTreeContext;
+class QtWebPageEventHandler;
+class QtWebUndoController;
+class ShareableBitmap;
 
-class QtPageClient : public WebKit::PageClient {
+class QtPageClient : public PageClient {
 public:
     QtPageClient();
     ~QtPageClient();
 
-    void initialize(QQuickWebView*, QtWebPageEventHandler*, QtWebUndoController*);
+    void initialize(QQuickWebView*, QtWebPageEventHandler*, WebKit::QtWebUndoController*);
 
     // QQuickWebView.
     virtual void setViewNeedsDisplay(const WebCore::IntRect&);
@@ -48,7 +48,7 @@ public:
     virtual void didReceiveMessageFromNavigatorQtObject(const String&);
     virtual void pageDidRequestScroll(const WebCore::IntPoint&);
     virtual void didChangeContentsSize(const WebCore::IntSize&);
-    virtual void didChangeViewportProperties(const WebCore::ViewportArguments&);
+    virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
     virtual void processDidCrash();
     virtual void didRelaunchProcess();
     virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
@@ -98,7 +98,9 @@ public:
     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
     virtual void updateTextInputState();
     virtual void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled);
+#if ENABLE(TOUCH_EVENTS)
     virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
+#endif
 
 private:
     QQuickWebView* m_webView;
@@ -106,4 +108,6 @@ private:
     QtWebUndoController* m_undoController;
 };
 
+} // namespace WebKit
+
 #endif /* QtPageClient_h */
-- 
cgit v1.2.1