diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/page/EventHandler.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/page/EventHandler.h')
-rw-r--r-- | Source/WebCore/page/EventHandler.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/WebCore/page/EventHandler.h b/Source/WebCore/page/EventHandler.h index 77668f1..1e825c2 100644 --- a/Source/WebCore/page/EventHandler.h +++ b/Source/WebCore/page/EventHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -53,9 +53,9 @@ class EventTarget; class FloatPoint; class FloatQuad; class Frame; +class HTMLFrameSetElement; class HitTestRequest; class HitTestResult; -class HTMLFrameSetElement; class KeyboardEvent; class MouseEventWithHitTestResults; class Node; @@ -65,13 +65,17 @@ class PlatformWheelEvent; class RenderLayer; class RenderObject; class RenderWidget; -class Scrollbar; class SVGElementInstance; +class Scrollbar; class TextEvent; class TouchEvent; class WheelEvent; class Widget; - + +#if ENABLE(GESTURE_EVENTS) +class PlatformGestureEvent; +#endif + #if ENABLE(DRAG_SUPPORT) extern const int LinkDragHysteresis; extern const int ImageDragHysteresis; @@ -104,6 +108,7 @@ public: RenderObject* autoscrollRenderer() const; void updateAutoscrollRenderer(); + void dispatchFakeMouseMoveEventSoon(); void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&); HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, @@ -161,6 +166,10 @@ public: bool handleWheelEvent(PlatformWheelEvent&); void defaultWheelEventHandler(Node*, WheelEvent*); +#if ENABLE(GESTURE_EVENTS) + bool handleGestureEvent(const PlatformGestureEvent&); +#endif + #if ENABLE(CONTEXT_MENUS) bool sendContextMenuEvent(const PlatformMouseEvent&); bool sendContextMenuEventForKey(); |