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

Unified Diff: third_party/WebKit/Source/core/events/WheelEvent.h

Issue 2586133003: Remove PlatformWheelEvent and use WebMouseWheelEvent instead (Closed)
Patch Set: Address comments Created 3 years, 12 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/events/WheelEvent.h
diff --git a/third_party/WebKit/Source/core/events/WheelEvent.h b/third_party/WebKit/Source/core/events/WheelEvent.h
index c263d43c41787d59536640337daba98d41e890a5..4e7043c9bf6dd5dc135ea839783cfabd655879f8 100644
--- a/third_party/WebKit/Source/core/events/WheelEvent.h
+++ b/third_party/WebKit/Source/core/events/WheelEvent.h
@@ -30,23 +30,10 @@
#include "core/events/MouseEvent.h"
#include "core/events/WheelEventInit.h"
#include "platform/geometry/FloatPoint.h"
+#include "public/platform/WebMouseWheelEvent.h"
namespace blink {
-class PlatformWheelEvent;
-
-#if OS(MACOSX)
-enum WheelEventPhase {
- WheelEventPhaseNone = 0,
- WheelEventPhaseBegan = 1 << 0,
- WheelEventPhaseStationary = 1 << 1,
- WheelEventPhaseChanged = 1 << 2,
- WheelEventPhaseEnded = 1 << 3,
- WheelEventPhaseCancelled = 1 << 4,
- WheelEventPhaseMayBegin = 1 << 5,
-};
-#endif
-
class CORE_EXPORT WheelEvent final : public MouseEvent {
DEFINE_WRAPPERTYPEINFO();
@@ -57,7 +44,7 @@ class CORE_EXPORT WheelEvent final : public MouseEvent {
static WheelEvent* create() { return new WheelEvent; }
- static WheelEvent* create(const PlatformWheelEvent& platformEvent,
+ static WheelEvent* create(const WebMouseWheelEvent& nativeEvent,
AbstractView*);
static WheelEvent* create(const AtomicString& type,
@@ -65,36 +52,6 @@ class CORE_EXPORT WheelEvent final : public MouseEvent {
return new WheelEvent(type, initializer);
}
- static WheelEvent* create(const FloatPoint& wheelTicks,
- const FloatPoint& rawDelta,
- unsigned deltaMode,
- AbstractView* view,
- const IntPoint& screenLocation,
- const IntPoint& windowLocation,
- PlatformEvent::Modifiers modifiers,
- unsigned short buttons,
- TimeTicks platformTimeStamp,
- int resendingPluginId,
- bool hasPreciseScrollingDeltas,
- RailsMode railsMode,
- bool cancelable
-#if OS(MACOSX)
- ,
- WheelEventPhase phase,
- WheelEventPhase momentumPhase
-#endif
- ) {
- return new WheelEvent(wheelTicks, rawDelta, deltaMode, view, screenLocation,
- windowLocation, modifiers, buttons, platformTimeStamp,
- resendingPluginId, hasPreciseScrollingDeltas,
- railsMode, cancelable
-#if OS(MACOSX)
- ,
- phase, momentumPhase
-#endif
- );
- }
-
double deltaX() const { return m_deltaX; } // Positive when scrolling right.
double deltaY() const { return m_deltaY; } // Positive when scrolling down.
double deltaZ() const { return m_deltaZ; }
@@ -108,15 +65,6 @@ class CORE_EXPORT WheelEvent final : public MouseEvent {
return m_wheelDelta.y();
} // Deprecated, negative when scrolling down.
unsigned deltaMode() const { return m_deltaMode; }
- float ticksX() const {
- return static_cast<float>(m_wheelDelta.x()) / TickMultiplier;
- }
- float ticksY() const {
- return static_cast<float>(m_wheelDelta.y()) / TickMultiplier;
- }
- int resendingPluginId() const { return m_resendingPluginId; }
- bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
- RailsMode getRailsMode() const { return m_railsMode; }
const AtomicString& interfaceName() const override;
bool isMouseEvent() const override;
@@ -124,59 +72,21 @@ class CORE_EXPORT WheelEvent final : public MouseEvent {
EventDispatchMediator* createMediator() override;
-#if OS(MACOSX)
- WheelEventPhase phase() const { return m_phase; }
- WheelEventPhase momentumPhase() const { return m_momentumPhase; }
-#endif
+ const WebMouseWheelEvent& nativeEvent() const { return m_nativeEvent; }
DECLARE_VIRTUAL_TRACE();
private:
WheelEvent();
WheelEvent(const AtomicString&, const WheelEventInit&);
- WheelEvent(const FloatPoint& wheelTicks,
- const FloatPoint& rawDelta,
- unsigned,
- AbstractView*,
- const IntPoint& screenLocation,
- const IntPoint& windowLocation,
- PlatformEvent::Modifiers,
- unsigned short buttons,
- TimeTicks platformTimeStamp,
- int resendingPluginId,
- bool hasPreciseScrollingDeltas,
- RailsMode,
- bool cancelable);
-#if OS(MACOSX)
- WheelEvent(const FloatPoint& wheelTicks,
- const FloatPoint& rawDelta,
- unsigned,
- AbstractView*,
- const IntPoint& screenLocation,
- const IntPoint& windowLocation,
- PlatformEvent::Modifiers,
- unsigned short buttons,
- TimeTicks platformTimeStamp,
- int resendingPluginId,
- bool hasPreciseScrollingDeltas,
- RailsMode,
- bool cancelable,
- WheelEventPhase phase,
- WheelEventPhase momentumPhase);
-#endif
+ WheelEvent(const WebMouseWheelEvent&, AbstractView*);
IntPoint m_wheelDelta;
double m_deltaX;
double m_deltaY;
double m_deltaZ;
unsigned m_deltaMode;
- int m_resendingPluginId;
- bool m_hasPreciseScrollingDeltas;
- RailsMode m_railsMode;
-#if OS(MACOSX)
- WheelEventPhase m_phase;
- WheelEventPhase m_momentumPhase;
-#endif
+ WebMouseWheelEvent m_nativeEvent;
};
DEFINE_EVENT_TYPE_CASTS(WheelEvent);

Powered by Google App Engine
This is Rietveld 408576698