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

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

Issue 759073002: Add canScroll bit to WebMouseWheelEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Modify unit test Created 6 years 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
« no previous file with comments | « no previous file | Source/core/events/WheelEvent.cpp » ('j') | Source/web/tests/WebInputEventConversionTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/events/WheelEvent.h
diff --git a/Source/core/events/WheelEvent.h b/Source/core/events/WheelEvent.h
index dd98ec56b6feca40d7763163a745d38c90853dac..d340cdb340dede95722b69d0e7edfeb2cb782212 100644
--- a/Source/core/events/WheelEvent.h
+++ b/Source/core/events/WheelEvent.h
@@ -68,10 +68,10 @@ public:
static PassRefPtrWillBeRawPtr<WheelEvent> create(const FloatPoint& wheelTicks,
const FloatPoint& rawDelta, unsigned deltaMode, PassRefPtrWillBeRawPtr<AbstractView> view,
const IntPoint& screenLocation, const IntPoint& pageLocation,
- bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
+ bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool canScroll)
{
return adoptRefWillBeNoop(new WheelEvent(wheelTicks, rawDelta, deltaMode, view,
- screenLocation, pageLocation, ctrlKey, altKey, shiftKey, metaKey));
+ screenLocation, pageLocation, ctrlKey, altKey, shiftKey, metaKey, canScroll));
}
double deltaX() const { return m_deltaX; } // Positive when scrolling right.
@@ -83,6 +83,7 @@ public:
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; }
+ bool canScroll() const { return m_canScroll; }
virtual const AtomicString& interfaceName() const override;
virtual bool isMouseEvent() const override;
@@ -95,13 +96,14 @@ private:
WheelEvent(const AtomicString&, const WheelEventInit&);
WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta,
unsigned, PassRefPtrWillBeRawPtr<AbstractView>, const IntPoint& screenLocation, const IntPoint& pageLocation,
- bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
+ bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool canScroll);
IntPoint m_wheelDelta;
double m_deltaX;
double m_deltaY;
double m_deltaZ;
unsigned m_deltaMode;
+ bool m_canScroll;
};
DEFINE_EVENT_TYPE_CASTS(WheelEvent);
« no previous file with comments | « no previous file | Source/core/events/WheelEvent.cpp » ('j') | Source/web/tests/WebInputEventConversionTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698