diff options
Diffstat (limited to 'Source/WebCore/dom/TouchEvent.cpp')
| -rw-r--r-- | Source/WebCore/dom/TouchEvent.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/WebCore/dom/TouchEvent.cpp b/Source/WebCore/dom/TouchEvent.cpp index acb2e4dee..f5cec7cc4 100644 --- a/Source/WebCore/dom/TouchEvent.cpp +++ b/Source/WebCore/dom/TouchEvent.cpp @@ -14,7 +14,7 @@ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -41,7 +41,7 @@ TouchEvent::TouchEvent() TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomicString& type, - PassRefPtr<AbstractView> view, int screenX, int screenY, int pageX, int pageY, + DOMWindow* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) : MouseRelatedEvent(type, true, true, currentTime(), view, 0, IntPoint(screenX, screenY), IntPoint(pageX, pageY), @@ -55,13 +55,21 @@ TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches, { } +TouchEvent::TouchEvent(const AtomicString& type, const Init& initializer, IsTrusted isTrusted) + : MouseRelatedEvent(type, initializer, isTrusted) + , m_touches(initializer.touches ? initializer.touches : TouchList::create()) + , m_targetTouches(initializer.targetTouches ? initializer.targetTouches : TouchList::create()) + , m_changedTouches(initializer.changedTouches ? initializer.changedTouches : TouchList::create()) +{ +} + TouchEvent::~TouchEvent() { } void TouchEvent::initTouchEvent(TouchList* touches, TouchList* targetTouches, TouchList* changedTouches, const AtomicString& type, - PassRefPtr<AbstractView> view, int screenX, int screenY, int clientX, int clientY, + DOMWindow* view, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) { if (dispatched()) |