diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/events/GestureEvent.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/events/GestureEvent.cpp | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/chromium/third_party/WebKit/Source/core/events/GestureEvent.cpp b/chromium/third_party/WebKit/Source/core/events/GestureEvent.cpp index 13d5f6f2a01..1fb72214e80 100644 --- a/chromium/third_party/WebKit/Source/core/events/GestureEvent.cpp +++ b/chromium/third_party/WebKit/Source/core/events/GestureEvent.cpp @@ -30,12 +30,7 @@ namespace WebCore { -PassRefPtr<GestureEvent> GestureEvent::create() -{ - return adoptRef(new GestureEvent); -} - -PassRefPtr<GestureEvent> GestureEvent::create(PassRefPtr<AbstractView> view, const PlatformGestureEvent& event) +PassRefPtrWillBeRawPtr<GestureEvent> GestureEvent::create(PassRefPtrWillBeRawPtr<AbstractView> view, const PlatformGestureEvent& event) { AtomicString eventType; float deltaX = 0; @@ -68,27 +63,9 @@ PassRefPtr<GestureEvent> GestureEvent::create(PassRefPtr<AbstractView> view, con case PlatformEvent::GesturePinchUpdate: case PlatformEvent::GestureTapDownCancel: default: - return 0; + return nullptr; } - return adoptRef(new GestureEvent(eventType, view, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), deltaX, deltaY)); -} - -void GestureEvent::initGestureEvent(const AtomicString& type, PassRefPtr<AbstractView> view, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, float deltaX, float deltaY) -{ - if (dispatched()) - return; - - initUIEvent(type, true, true, view, 0); - m_screenLocation = IntPoint(screenX, screenY); - m_ctrlKey = ctrlKey; - m_altKey = altKey; - m_shiftKey = shiftKey; - m_metaKey = metaKey; - - m_deltaX = deltaX; - m_deltaY = deltaY; - - initCoordinates(IntPoint(clientX, clientY)); + return adoptRefWillBeNoop(new GestureEvent(eventType, view, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), deltaX, deltaY)); } const AtomicString& GestureEvent::interfaceName() const @@ -110,14 +87,19 @@ GestureEvent::GestureEvent() { } -GestureEvent::GestureEvent(const AtomicString& type, PassRefPtr<AbstractView> view, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, float deltaX, float deltaY) +GestureEvent::GestureEvent(const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, float deltaX, float deltaY) : MouseRelatedEvent(type, true, true, view, 0, IntPoint(screenX, screenY), IntPoint(clientX, clientY), IntPoint(0, 0), ctrlKey, altKey, shiftKey, metaKey) , m_deltaX(deltaX) , m_deltaY(deltaY) { } -GestureEventDispatchMediator::GestureEventDispatchMediator(PassRefPtr<GestureEvent> gestureEvent) +void GestureEvent::trace(Visitor* visitor) +{ + MouseRelatedEvent::trace(visitor); +} + +GestureEventDispatchMediator::GestureEventDispatchMediator(PassRefPtrWillBeRawPtr<GestureEvent> gestureEvent) : EventDispatchMediator(gestureEvent) { } |