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

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

Issue 920523003: Plumb WebTouchEvent::causesScrollingIfUncanceled to TouchEvent and (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | Source/core/events/TouchEvent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/events/TouchEvent.h
diff --git a/Source/core/events/TouchEvent.h b/Source/core/events/TouchEvent.h
index 021a6754bb73b84cc5a501b7f000343185d8eead..7ae4ba5fe247fd0ebcb5fcaa9285bfbe0e83b8bc 100644
--- a/Source/core/events/TouchEvent.h
+++ b/Source/core/events/TouchEvent.h
@@ -45,11 +45,11 @@ public:
static PassRefPtrWillBeRawPtr<TouchEvent> create(TouchList* touches,
TouchList* targetTouches, TouchList* changedTouches,
const AtomicString& type, PassRefPtrWillBeRawPtr<AbstractView> view,
- bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool cancelable,
+ bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool cancelable, bool causesScrollingIfUncanceled,
double uiCreateTime = 0)
{
return adoptRefWillBeNoop(new TouchEvent(touches, targetTouches, changedTouches, type, view,
- ctrlKey, altKey, shiftKey, metaKey, cancelable, uiCreateTime));
+ ctrlKey, altKey, shiftKey, metaKey, cancelable, causesScrollingIfUncanceled, uiCreateTime));
}
void initTouchEvent(TouchList* touches, TouchList* targetTouches,
@@ -66,6 +66,8 @@ public:
void setTargetTouches(PassRefPtrWillBeRawPtr<TouchList> targetTouches) { m_targetTouches = targetTouches; }
void setChangedTouches(PassRefPtrWillBeRawPtr<TouchList> changedTouches) { m_changedTouches = changedTouches; }
+ bool causesScrollingIfUncanceled() const { return m_causesScrollingIfUncanceled; }
+
virtual bool isTouchEvent() const override;
virtual const AtomicString& interfaceName() const override;
@@ -79,12 +81,13 @@ private:
TouchEvent(TouchList* touches, TouchList* targetTouches,
TouchList* changedTouches, const AtomicString& type,
PassRefPtrWillBeRawPtr<AbstractView>,
- bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool cancelable,
+ bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool cancelable, bool causesScrollingIfUncanceled,
double uiCreateTime = 0);
RefPtrWillBeMember<TouchList> m_touches;
RefPtrWillBeMember<TouchList> m_targetTouches;
RefPtrWillBeMember<TouchList> m_changedTouches;
+ bool m_causesScrollingIfUncanceled;
};
class TouchEventDispatchMediator final : public EventDispatchMediator {
« no previous file with comments | « no previous file | Source/core/events/TouchEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698