Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/WebKit/Source/core/events/WheelEvent.cpp

Issue 2052663004: Remove canScroll from WebMouseWheelEvent as it is unused now. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix android unit test Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved.
6 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 6 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 22 matching lines...) Expand all
33 { 33 {
34 return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::DOM_DELTA _PAGE : WheelEvent::DOM_DELTA_PIXEL; 34 return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::DOM_DELTA _PAGE : WheelEvent::DOM_DELTA_PIXEL;
35 } 35 }
36 36
37 WheelEvent* WheelEvent::create(const PlatformWheelEvent& event, AbstractView* vi ew) 37 WheelEvent* WheelEvent::create(const PlatformWheelEvent& event, AbstractView* vi ew)
38 { 38 {
39 return new WheelEvent(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()), 39 return new WheelEvent(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()),
40 convertDeltaMode(event), view, event.globalPosition(), event.position(), 40 convertDeltaMode(event), view, event.globalPosition(), event.position(),
41 event.getModifiers(), 41 event.getModifiers(),
42 MouseEvent::platformModifiersToButtons(event.getModifiers()), event.time stamp(), 42 MouseEvent::platformModifiersToButtons(event.getModifiers()), event.time stamp(),
43 event.canScroll(), event.resendingPluginId(), event.hasPreciseScrollingD eltas(), 43 event.resendingPluginId(), event.hasPreciseScrollingDeltas(),
44 static_cast<Event::RailsMode>(event.getRailsMode()), 44 static_cast<Event::RailsMode>(event.getRailsMode()),
45 event.cancelable()); 45 event.cancelable());
46 } 46 }
47 47
48 WheelEvent::WheelEvent() 48 WheelEvent::WheelEvent()
49 : m_deltaX(0) 49 : m_deltaX(0)
50 , m_deltaY(0) 50 , m_deltaY(0)
51 , m_deltaZ(0) 51 , m_deltaZ(0)
52 , m_deltaMode(DOM_DELTA_PIXEL) 52 , m_deltaMode(DOM_DELTA_PIXEL)
53 , m_canScroll(true)
54 , m_resendingPluginId(-1) 53 , m_resendingPluginId(-1)
55 , m_hasPreciseScrollingDeltas(false) 54 , m_hasPreciseScrollingDeltas(false)
56 , m_railsMode(RailsModeFree) 55 , m_railsMode(RailsModeFree)
57 { 56 {
58 } 57 }
59 58
60 WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ er) 59 WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ er)
61 : MouseEvent(type, initializer) 60 : MouseEvent(type, initializer)
62 , m_wheelDelta(initializer.wheelDeltaX() ? initializer.wheelDeltaX() : -init ializer.deltaX(), initializer.wheelDeltaY() ? initializer.wheelDeltaY() : -initi alizer.deltaY()) 61 , m_wheelDelta(initializer.wheelDeltaX() ? initializer.wheelDeltaX() : -init ializer.deltaX(), initializer.wheelDeltaY() ? initializer.wheelDeltaY() : -initi alizer.deltaY())
63 , m_deltaX(initializer.deltaX() ? initializer.deltaX() : -initializer.wheelD eltaX()) 62 , m_deltaX(initializer.deltaX() ? initializer.deltaX() : -initializer.wheelD eltaX())
64 , m_deltaY(initializer.deltaY() ? initializer.deltaY() : -initializer.wheelD eltaY()) 63 , m_deltaY(initializer.deltaY() ? initializer.deltaY() : -initializer.wheelD eltaY())
65 , m_deltaZ(initializer.deltaZ()) 64 , m_deltaZ(initializer.deltaZ())
66 , m_deltaMode(initializer.deltaMode()) 65 , m_deltaMode(initializer.deltaMode())
67 , m_canScroll(true)
68 , m_resendingPluginId(-1) 66 , m_resendingPluginId(-1)
69 , m_hasPreciseScrollingDeltas(false) 67 , m_hasPreciseScrollingDeltas(false)
70 , m_railsMode(RailsModeFree) 68 , m_railsMode(RailsModeFree)
71 { 69 {
72 } 70 }
73 71
74 WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode, 72 WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode,
75 AbstractView* view, const IntPoint& screenLocation, const IntPoint& windowLo cation, 73 AbstractView* view, const IntPoint& screenLocation, const IntPoint& windowLo cation,
76 PlatformEvent::Modifiers modifiers, unsigned short buttons, double platformT imeStamp, 74 PlatformEvent::Modifiers modifiers, unsigned short buttons, double platformT imeStamp,
77 bool canScroll, int resendingPluginId, bool hasPreciseScrollingDeltas, Rails Mode railsMode, bool cancelable) 75 int resendingPluginId, bool hasPreciseScrollingDeltas, RailsMode railsMode, bool cancelable)
78 : MouseEvent(EventTypeNames::wheel, true, cancelable, view, 0, screenLocatio n.x(), screenLocation.y(), 76 : MouseEvent(EventTypeNames::wheel, true, cancelable, view, 0, screenLocatio n.x(), screenLocation.y(),
79 windowLocation.x(), windowLocation.y(), 0, 0, modifiers, 0, buttons, 77 windowLocation.x(), windowLocation.y(), 0, 0, modifiers, 0, buttons,
80 nullptr, platformTimeStamp, PlatformMouseEvent::RealOrIndistinguishable, 78 nullptr, platformTimeStamp, PlatformMouseEvent::RealOrIndistinguishable,
81 // TODO(zino): Should support canvas hit region because the wheel event 79 // TODO(zino): Should support canvas hit region because the wheel event
82 // is a kind of mouse event. Please see http://crbug.com/594075 80 // is a kind of mouse event. Please see http://crbug.com/594075
83 String()) 81 String())
84 , m_wheelDelta(wheelTicks.x() * TickMultiplier, wheelTicks.y() * TickMultipl ier) 82 , m_wheelDelta(wheelTicks.x() * TickMultiplier, wheelTicks.y() * TickMultipl ier)
85 , m_deltaX(-rawDelta.x()) 83 , m_deltaX(-rawDelta.x())
86 , m_deltaY(-rawDelta.y()) 84 , m_deltaY(-rawDelta.y())
87 , m_deltaZ(0) 85 , m_deltaZ(0)
88 , m_deltaMode(deltaMode) 86 , m_deltaMode(deltaMode)
89 , m_canScroll(canScroll)
90 , m_resendingPluginId(resendingPluginId) 87 , m_resendingPluginId(resendingPluginId)
91 , m_hasPreciseScrollingDeltas(hasPreciseScrollingDeltas) 88 , m_hasPreciseScrollingDeltas(hasPreciseScrollingDeltas)
92 , m_railsMode(railsMode) 89 , m_railsMode(railsMode)
93 { 90 {
94 } 91 }
95 92
96 const AtomicString& WheelEvent::interfaceName() const 93 const AtomicString& WheelEvent::interfaceName() const
97 { 94 {
98 return EventNames::WheelEvent; 95 return EventNames::WheelEvent;
99 } 96 }
(...skipping 12 matching lines...) Expand all
112 { 109 {
113 return EventDispatchMediator::create(this); 110 return EventDispatchMediator::create(this);
114 } 111 }
115 112
116 DEFINE_TRACE(WheelEvent) 113 DEFINE_TRACE(WheelEvent)
117 { 114 {
118 MouseEvent::trace(visitor); 115 MouseEvent::trace(visitor);
119 } 116 }
120 117
121 } // namespace blink 118 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/WheelEvent.h ('k') | third_party/WebKit/Source/platform/PlatformWheelEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698