Title: [254494] trunk/Source/WebKit
- Revision
- 254494
- Author
- [email protected]
- Date
- 2020-01-13 22:24:26 -0800 (Mon, 13 Jan 2020)
Log Message
Expose Phase on all WebWheelEvent implementations
https://bugs.webkit.org/show_bug.cgi?id=206195
Reviewed by Don Olmstead.
No change to behavior; just unhide what needn't be hidden.
* Shared/WebEvent.h:
(WebKit::WebWheelEvent::directionInvertedFromDevice const):
(WebKit::WebWheelEvent::momentumPhase const):
* Shared/WebWheelEvent.cpp:
(WebKit::WebWheelEvent::WebWheelEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (254493 => 254494)
--- trunk/Source/WebKit/ChangeLog 2020-01-14 05:56:59 UTC (rev 254493)
+++ trunk/Source/WebKit/ChangeLog 2020-01-14 06:24:26 UTC (rev 254494)
@@ -1,3 +1,18 @@
+2020-01-13 Ross Kirsling <[email protected]>
+
+ Expose Phase on all WebWheelEvent implementations
+ https://bugs.webkit.org/show_bug.cgi?id=206195
+
+ Reviewed by Don Olmstead.
+
+ No change to behavior; just unhide what needn't be hidden.
+
+ * Shared/WebEvent.h:
+ (WebKit::WebWheelEvent::directionInvertedFromDevice const):
+ (WebKit::WebWheelEvent::momentumPhase const):
+ * Shared/WebWheelEvent.cpp:
+ (WebKit::WebWheelEvent::WebWheelEvent):
+
2020-01-13 Don Olmstead <[email protected]>
Share WebPreferences stub for ports without an implementation
Modified: trunk/Source/WebKit/Shared/WebEvent.h (254493 => 254494)
--- trunk/Source/WebKit/Shared/WebEvent.h 2020-01-14 05:56:59 UTC (rev 254493)
+++ trunk/Source/WebKit/Shared/WebEvent.h 2020-01-14 06:24:26 UTC (rev 254494)
@@ -190,7 +190,6 @@
ScrollByPixelWheelEvent
};
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
enum Phase {
PhaseNone = 0,
PhaseBegan = 1 << 0,
@@ -200,7 +199,6 @@
PhaseCancelled = 1 << 4,
PhaseMayBegin = 1 << 5,
};
-#endif
WebWheelEvent() { }
@@ -217,10 +215,8 @@
const WebCore::FloatSize wheelTicks() const { return m_wheelTicks; }
Granularity granularity() const { return static_cast<Granularity>(m_granularity); }
bool directionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
Phase phase() const { return static_cast<Phase>(m_phase); }
Phase momentumPhase() const { return static_cast<Phase>(m_momentumPhase); }
-#endif
#if PLATFORM(COCOA)
bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
uint32_t scrollCount() const { return m_scrollCount; }
@@ -239,10 +235,8 @@
WebCore::FloatSize m_wheelTicks;
uint32_t m_granularity; // Granularity
bool m_directionInvertedFromDevice;
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
uint32_t m_phase { Phase::PhaseNone };
uint32_t m_momentumPhase { Phase::PhaseNone };
-#endif
#if PLATFORM(COCOA)
bool m_hasPreciseScrollingDeltas;
uint32_t m_scrollCount;
Modified: trunk/Source/WebKit/Shared/WebWheelEvent.cpp (254493 => 254494)
--- trunk/Source/WebKit/Shared/WebWheelEvent.cpp 2020-01-14 05:56:59 UTC (rev 254493)
+++ trunk/Source/WebKit/Shared/WebWheelEvent.cpp 2020-01-14 06:24:26 UTC (rev 254494)
@@ -41,7 +41,6 @@
, m_granularity(granularity)
, m_directionInvertedFromDevice(false)
#if PLATFORM(COCOA)
- , m_phase(PhaseNone)
, m_hasPreciseScrollingDeltas(false)
, m_scrollCount(0)
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
