| Index: Source/core/page/EventWithHitTestResults.h
|
| diff --git a/Source/core/page/MouseEventWithHitTestResults.h b/Source/core/page/EventWithHitTestResults.h
|
| similarity index 66%
|
| rename from Source/core/page/MouseEventWithHitTestResults.h
|
| rename to Source/core/page/EventWithHitTestResults.h
|
| index f4d2e2972324bf50138e59dd6984e1aa67b265d2..84b46136485881d881b810e53352ad20f8c0e372 100644
|
| --- a/Source/core/page/MouseEventWithHitTestResults.h
|
| +++ b/Source/core/page/EventWithHitTestResults.h
|
| @@ -18,34 +18,46 @@
|
| Boston, MA 02110-1301, USA.
|
| */
|
|
|
| -#ifndef MouseEventWithHitTestResults_h
|
| -#define MouseEventWithHitTestResults_h
|
| +#ifndef EventWithHitTestResults_h
|
| +#define EventWithHitTestResults_h
|
|
|
| #include "core/rendering/HitTestResult.h"
|
| +#include "platform/PlatformEvent.h"
|
| +#include "platform/PlatformGestureEvent.h"
|
| #include "platform/PlatformMouseEvent.h"
|
|
|
| namespace WebCore {
|
|
|
| class Scrollbar;
|
|
|
| -class MouseEventWithHitTestResults {
|
| +template <typename EventType>
|
| +class EventWithHitTestResults {
|
| STACK_ALLOCATED();
|
| +
|
| public:
|
| - MouseEventWithHitTestResults(const PlatformMouseEvent&, const HitTestResult&);
|
| + EventWithHitTestResults(const EventType& event, const HitTestResult& hitTestResult)
|
| + : m_event(event)
|
| + , m_hitTestResult(hitTestResult)
|
| + {
|
| + }
|
|
|
| - const PlatformMouseEvent& event() const { return m_event; }
|
| + const EventType& event() const { return m_event; }
|
| const HitTestResult& hitTestResult() const { return m_hitTestResult; }
|
| LayoutPoint localPoint() const { return m_hitTestResult.localPoint(); }
|
| Scrollbar* scrollbar() const { return m_hitTestResult.scrollbar(); }
|
| - bool isOverLink() const;
|
| + bool isOverLink() const { return m_hitTestResult.isOverLink(); }
|
| bool isOverWidget() const { return m_hitTestResult.isOverWidget(); }
|
| Node* targetNode() const { return m_hitTestResult.targetNode(); }
|
|
|
| private:
|
| - PlatformMouseEvent m_event;
|
| + EventType m_event;
|
| HitTestResult m_hitTestResult;
|
| };
|
|
|
| +typedef EventWithHitTestResults<PlatformMouseEvent> MouseEventWithHitTestResults;
|
| +
|
| +typedef EventWithHitTestResults<PlatformGestureEvent> GestureEventWithHitTestResults;
|
| +
|
| } // namespace WebCore
|
|
|
| -#endif // MouseEventWithHitTestResults_h
|
| +#endif // EventWithHitTestResults_h
|
|
|