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

Side by Side Diff: Source/core/events/TouchEvent.cpp

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/events/TouchEvent.h ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2008, The Android Open Source Project 2 * Copyright 2008, The Android Open Source Project
3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. 3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above copyright 10 * * Redistributions in binary form must reproduce the above copyright
(...skipping 24 matching lines...) Expand all
35 35
36 namespace blink { 36 namespace blink {
37 37
38 TouchEvent::TouchEvent() 38 TouchEvent::TouchEvent()
39 { 39 {
40 } 40 }
41 41
42 TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches, 42 TouchEvent::TouchEvent(TouchList* touches, TouchList* targetTouches,
43 TouchList* changedTouches, const AtomicString& type, 43 TouchList* changedTouches, const AtomicString& type,
44 PassRefPtrWillBeRawPtr<AbstractView> view, 44 PassRefPtrWillBeRawPtr<AbstractView> view,
45 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool cancelable, 45 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool cancelable, bool causesScrollingIfUncanceled,
46 double uiCreateTime) 46 double uiCreateTime)
47 : UIEventWithKeyState(type, true, cancelable, view, 0, 47 : UIEventWithKeyState(type, true, cancelable, view, 0,
48 ctrlKey, altKey, shiftKey, metaKey) 48 ctrlKey, altKey, shiftKey, metaKey)
49 , m_touches(touches) 49 , m_touches(touches)
50 , m_targetTouches(targetTouches) 50 , m_targetTouches(targetTouches)
51 , m_changedTouches(changedTouches) 51 , m_changedTouches(changedTouches)
52 , m_causesScrollingIfUncanceled(causesScrollingIfUncanceled)
52 { 53 {
53 setUICreateTime(uiCreateTime); 54 setUICreateTime(uiCreateTime);
54 } 55 }
55 56
56 TouchEvent::~TouchEvent() 57 TouchEvent::~TouchEvent()
57 { 58 {
58 } 59 }
59 60
60 void TouchEvent::initTouchEvent(TouchList* touches, TouchList* targetTouches, 61 void TouchEvent::initTouchEvent(TouchList* touches, TouchList* targetTouches,
61 TouchList* changedTouches, const AtomicString& type, 62 TouchList* changedTouches, const AtomicString& type,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 return toTouchEvent(EventDispatchMediator::event()); 127 return toTouchEvent(EventDispatchMediator::event());
127 } 128 }
128 129
129 bool TouchEventDispatchMediator::dispatchEvent(EventDispatcher& dispatcher) cons t 130 bool TouchEventDispatchMediator::dispatchEvent(EventDispatcher& dispatcher) cons t
130 { 131 {
131 event().eventPath().adjustForTouchEvent(event()); 132 event().eventPath().adjustForTouchEvent(event());
132 return dispatcher.dispatch(); 133 return dispatcher.dispatch();
133 } 134 }
134 135
135 } // namespace blink 136 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/TouchEvent.h ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698