| Index: sky/engine/platform/PlatformWheelEvent.h
|
| diff --git a/sky/engine/platform/PlatformWheelEvent.h b/sky/engine/platform/PlatformWheelEvent.h
|
| index 57ca1012057614ba20bff42573aa8907eac3974a..9c23179a9cf21e7d38e20f5a09c6cfe8fb4b5ac1 100644
|
| --- a/sky/engine/platform/PlatformWheelEvent.h
|
| +++ b/sky/engine/platform/PlatformWheelEvent.h
|
| @@ -41,18 +41,6 @@ enum PlatformWheelEventGranularity {
|
| ScrollByPixelWheelEvent,
|
| };
|
|
|
| -#if OS(MACOSX)
|
| -enum PlatformWheelEventPhase {
|
| - PlatformWheelEventPhaseNone = 0,
|
| - PlatformWheelEventPhaseBegan = 1 << 0,
|
| - PlatformWheelEventPhaseStationary = 1 << 1,
|
| - PlatformWheelEventPhaseChanged = 1 << 2,
|
| - PlatformWheelEventPhaseEnded = 1 << 3,
|
| - PlatformWheelEventPhaseCancelled = 1 << 4,
|
| - PlatformWheelEventPhaseMayBegin = 1 << 5,
|
| -};
|
| -#endif
|
| -
|
| class PlatformWheelEvent : public PlatformEvent {
|
| public:
|
| PlatformWheelEvent()
|
| @@ -63,15 +51,6 @@ public:
|
| , m_wheelTicksY(0)
|
| , m_granularity(ScrollByPixelWheelEvent)
|
| , m_hasPreciseScrollingDeltas(false)
|
| -#if OS(MACOSX)
|
| - , m_phase(PlatformWheelEventPhaseNone)
|
| - , m_momentumPhase(PlatformWheelEventPhaseNone)
|
| - , m_scrollCount(0)
|
| - , m_unacceleratedScrollingDeltaX(0)
|
| - , m_unacceleratedScrollingDeltaY(0)
|
| - , m_canRubberbandLeft(true)
|
| - , m_canRubberbandRight(true)
|
| -#endif
|
| {
|
| }
|
|
|
| @@ -85,15 +64,6 @@ public:
|
| , m_wheelTicksY(wheelTicksY)
|
| , m_granularity(granularity)
|
| , m_hasPreciseScrollingDeltas(false)
|
| -#if OS(MACOSX)
|
| - , m_phase(PlatformWheelEventPhaseNone)
|
| - , m_momentumPhase(PlatformWheelEventPhaseNone)
|
| - , m_scrollCount(0)
|
| - , m_unacceleratedScrollingDeltaX(0)
|
| - , m_unacceleratedScrollingDeltaY(0)
|
| - , m_canRubberbandLeft(true)
|
| - , m_canRubberbandRight(true)
|
| -#endif
|
| {
|
| }
|
|
|
| @@ -110,18 +80,7 @@ public:
|
|
|
| bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
|
| void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
|
| -#if OS(MACOSX)
|
| - PlatformWheelEventPhase phase() const { return m_phase; }
|
| - PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
|
| - unsigned scrollCount() const { return m_scrollCount; }
|
| - float unacceleratedScrollingDeltaX() const { return m_unacceleratedScrollingDeltaX; }
|
| - float unacceleratedScrollingDeltaY() const { return m_unacceleratedScrollingDeltaY; }
|
| - bool useLatchedEventNode() const { return m_momentumPhase == PlatformWheelEventPhaseBegan || m_momentumPhase == PlatformWheelEventPhaseChanged; }
|
| - bool canRubberbandLeft() const { return m_canRubberbandLeft; }
|
| - bool canRubberbandRight() const { return m_canRubberbandRight; }
|
| -#else
|
| bool useLatchedEventNode() const { return false; }
|
| -#endif
|
|
|
| protected:
|
| IntPoint m_position;
|
| @@ -132,15 +91,6 @@ protected:
|
| float m_wheelTicksY;
|
| PlatformWheelEventGranularity m_granularity;
|
| bool m_hasPreciseScrollingDeltas;
|
| -#if OS(MACOSX)
|
| - PlatformWheelEventPhase m_phase;
|
| - PlatformWheelEventPhase m_momentumPhase;
|
| - unsigned m_scrollCount;
|
| - float m_unacceleratedScrollingDeltaX;
|
| - float m_unacceleratedScrollingDeltaY;
|
| - bool m_canRubberbandLeft;
|
| - bool m_canRubberbandRight;
|
| -#endif
|
| };
|
|
|
| } // namespace blink
|
|
|