--- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h Wed Sep 01 12:28:30 2010 +0100
@@ -20,8 +20,9 @@
#include <e32base.h>
#include <w32std.h>
+#include <stmgestureinterface.h>
#include "Timer.h"
-#include <rt_gesturehelper.h>
+
namespace WebCore
{
@@ -31,8 +32,9 @@
class WebView;
class CActiveSchedulerWait;
+class WebGestureInterface;
-class WebPointerEventHandler : public CBase, public RT_GestureHelper::MGestureObserver
+class WebPointerEventHandler : public CBase
{
public:
static WebPointerEventHandler* NewL(WebView* view);
@@ -42,25 +44,24 @@
public:
void HandlePointerEventL(const TPointerEvent& aPointerEvent);
void HandleHighlightChange(const TPoint &aPoint);
-
- virtual void HandleGestureL( const RT_GestureHelper::TGestureEvent& aEvent );
-
+ void HandleGestureEventL(const TStmGestureEvent& aGesture);
private:
- bool checkForEventListener(WebCore::Node* node);
bool canDehighlight(const TPoint &aPoint);
void dehighlight();
bool isHighlitableElement(TBrCtlDefs::TBrCtlElementType& elType);
TBrCtlDefs::TBrCtlElementType highlitableElement();
- void buttonDownTimerCB(WebCore::Timer<WebPointerEventHandler>* t);
- void handleTouchDownL(const RT_GestureHelper::TGestureEvent& aEvent);
- void handleTouchUp(const RT_GestureHelper::TGestureEvent& aEvent);
- void handleTapL(const RT_GestureHelper::TGestureEvent& aEvent);
- void handleDoubleTap(const RT_GestureHelper::TGestureEvent& aEvent);
- void handleMove(const RT_GestureHelper::TGestureEvent& aEvent);
+ void doTouchDownL();
+ void handleTouchDownL(const TStmGestureEvent& aGesture);
+ void handleTouchUp(const TStmGestureEvent& aGesture);
+ void handleTapL(const TStmGestureEvent& aGesture);
+ void handleDoubleTap(const TStmGestureEvent& aGesture);
+ void handleMove(const TStmGestureEvent& aGesture);
void doTapL();
void updateCursor(const TPoint& pos);
+ void handlePinchZoomL(const TStmGestureEvent& aGesture);
+ bool isPluginConsumable(const TStmGestureUid uid);
private:
WebPointerEventHandler(WebView* view);
WebView* m_webview;
@@ -75,12 +76,8 @@
TPoint m_highlightPos;
WebCore::Node* m_highlightedNode;
TPointerEvent m_currentEvent;
- WebCore::Timer<WebPointerEventHandler> m_buttonDownTimer;
-
- RT_GestureHelper::CGestureHelper* m_gestureHelper;
- TPointerEvent m_lastPointerEvent;
bool m_ignoreTap;
- CActiveSchedulerWait* m_waiter;
+ WebGestureInterface* m_gestureInterface;
};