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

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

Issue 453493002: Improve detection of touch events when hiding media controls. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@autoHideControls
Patch Set: Revert Patch Set 8 Created 6 years, 3 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
« no previous file with comments | « Source/core/events/MouseRelatedEvent.h ('k') | Source/core/html/shadow/MediaControls.h » ('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 (C) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved.
6 * Copyright (C) 2013 Samsung Electronics. All rights reserved. 6 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2 of the License, or (at your option) any later version. 11 * version 2 of the License, or (at your option) any later version.
12 * 12 *
13 * This library is distributed in the hope that it will be useful, 13 * This library is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Library General Public License for more details. 16 * Library General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Library General Public License 18 * You should have received a copy of the GNU Library General Public License
19 * along with this library; see the file COPYING.LIB. If not, write to 19 * along with this library; see the file COPYING.LIB. If not, write to
20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 20 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
21 * Boston, MA 02110-1301, USA. 21 * Boston, MA 02110-1301, USA.
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/events/WheelEvent.h" 25 #include "core/events/WheelEvent.h"
26 26
27 #include "core/clipboard/DataTransfer.h" 27 #include "core/clipboard/DataTransfer.h"
28 #include "platform/PlatformMouseEvent.h"
28 #include "platform/PlatformWheelEvent.h" 29 #include "platform/PlatformWheelEvent.h"
29 30
30 namespace blink { 31 namespace blink {
31 32
32 WheelEventInit::WheelEventInit() 33 WheelEventInit::WheelEventInit()
33 : deltaX(0) 34 : deltaX(0)
34 , deltaY(0) 35 , deltaY(0)
35 , deltaZ(0) 36 , deltaZ(0)
36 , wheelDeltaX(0) 37 , wheelDeltaX(0)
37 , wheelDeltaY(0) 38 , wheelDeltaY(0)
(...skipping 17 matching lines...) Expand all
55 , m_deltaY(initializer.deltaY ? initializer.deltaY : -initializer.wheelDelta Y) 56 , m_deltaY(initializer.deltaY ? initializer.deltaY : -initializer.wheelDelta Y)
56 , m_deltaZ(initializer.deltaZ) 57 , m_deltaZ(initializer.deltaZ)
57 , m_deltaMode(initializer.deltaMode) 58 , m_deltaMode(initializer.deltaMode)
58 { 59 {
59 ScriptWrappable::init(this); 60 ScriptWrappable::init(this);
60 } 61 }
61 62
62 WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode, 63 WheelEvent::WheelEvent(const FloatPoint& wheelTicks, const FloatPoint& rawDelta, unsigned deltaMode,
63 PassRefPtrWillBeRawPtr<AbstractView> view, const IntPoint& screenLocation, c onst IntPoint& pageLocation, 64 PassRefPtrWillBeRawPtr<AbstractView> view, const IntPoint& screenLocation, c onst IntPoint& pageLocation,
64 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey) 65 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
65 : MouseEvent(EventTypeNames::wheel, 66 : MouseEvent(EventTypeNames::wheel, true, true, view, 0, screenLocation.x(), screenLocation.y(),
66 true, true, view, 0, screenLocation.x(), screenLocation.y(), 67 pageLocation.x(), pageLocation.y(), 0, 0, ctrlKey, altKey, shiftKey, met aKey, 0, nullptr,
67 pageLocation.x(), pageLocation.y(), 68 nullptr, false, PlatformMouseEvent::RealOrIndistinguishable)
68 0, 0,
69 ctrlKey, altKey, shiftKey, metaKey, 0, nullptr, nullptr, false)
70 , m_wheelDelta(wheelTicks.x() * TickMultiplier, wheelTicks.y() * TickMultipl ier) 69 , m_wheelDelta(wheelTicks.x() * TickMultiplier, wheelTicks.y() * TickMultipl ier)
71 , m_deltaX(-rawDelta.x()) 70 , m_deltaX(-rawDelta.x())
72 , m_deltaY(-rawDelta.y()) 71 , m_deltaY(-rawDelta.y())
73 , m_deltaZ(0) 72 , m_deltaZ(0)
74 , m_deltaMode(deltaMode) 73 , m_deltaMode(deltaMode)
75 { 74 {
76 ScriptWrappable::init(this); 75 ScriptWrappable::init(this);
77 } 76 }
78 77
79 const AtomicString& WheelEvent::interfaceName() const 78 const AtomicString& WheelEvent::interfaceName() const
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return toWheelEvent(EventDispatchMediator::event()); 120 return toWheelEvent(EventDispatchMediator::event());
122 } 121 }
123 122
124 bool WheelEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) cons t 123 bool WheelEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) cons t
125 { 124 {
126 ASSERT(event()); 125 ASSERT(event());
127 return EventDispatchMediator::dispatchEvent(dispatcher) && !event()->default Handled(); 126 return EventDispatchMediator::dispatchEvent(dispatcher) && !event()->default Handled();
128 } 127 }
129 128
130 } // namespace blink 129 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/MouseRelatedEvent.h ('k') | Source/core/html/shadow/MediaControls.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698