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

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

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5: rebase-and-stuff Created 4 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
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
(...skipping 23 matching lines...) Expand all
34 return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::DOM_DELTA _PAGE : WheelEvent::DOM_DELTA_PIXEL; 34 return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::DOM_DELTA _PAGE : WheelEvent::DOM_DELTA_PIXEL;
35 } 35 }
36 36
37 PassRefPtrWillBeRawPtr<WheelEvent> WheelEvent::create(const PlatformWheelEvent& event, PassRefPtrWillBeRawPtr<AbstractView> view) 37 PassRefPtrWillBeRawPtr<WheelEvent> WheelEvent::create(const PlatformWheelEvent& event, PassRefPtrWillBeRawPtr<AbstractView> view)
38 { 38 {
39 return adoptRefWillBeNoop(new WheelEvent(FloatPoint(event.wheelTicksX(), eve nt.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()), 39 return adoptRefWillBeNoop(new WheelEvent(FloatPoint(event.wheelTicksX(), eve nt.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()),
40 convertDeltaMode(event), view, event.globalPosition(), event.position(), 40 convertDeltaMode(event), view, event.globalPosition(), event.position(),
41 event.modifiers(), 41 event.modifiers(),
42 MouseEvent::platformModifiersToButtons(event.modifiers()), event.timesta mp(), 42 MouseEvent::platformModifiersToButtons(event.modifiers()), event.timesta mp(),
43 event.canScroll(), event.resendingPluginId(), event.hasPreciseScrollingD eltas(), 43 event.canScroll(), event.resendingPluginId(), event.hasPreciseScrollingD eltas(),
44 static_cast<Event::RailsMode>(event.railsMode()))); 44 static_cast<Event::RailsMode>(event.getRailsMode())));
45 } 45 }
46 46
47 WheelEvent::WheelEvent() 47 WheelEvent::WheelEvent()
48 : m_deltaX(0) 48 : m_deltaX(0)
49 , m_deltaY(0) 49 , m_deltaY(0)
50 , m_deltaZ(0) 50 , m_deltaZ(0)
51 , m_deltaMode(DOM_DELTA_PIXEL) 51 , m_deltaMode(DOM_DELTA_PIXEL)
52 , m_canScroll(true) 52 , m_canScroll(true)
53 , m_resendingPluginId(-1) 53 , m_resendingPluginId(-1)
54 , m_hasPreciseScrollingDeltas(false) 54 , m_hasPreciseScrollingDeltas(false)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 { 128 {
129 return toWheelEvent(EventDispatchMediator::event()); 129 return toWheelEvent(EventDispatchMediator::event());
130 } 130 }
131 131
132 bool WheelEventDispatchMediator::dispatchEvent(EventDispatcher& dispatcher) cons t 132 bool WheelEventDispatchMediator::dispatchEvent(EventDispatcher& dispatcher) cons t
133 { 133 {
134 return EventDispatchMediator::dispatchEvent(dispatcher) && !event().defaultH andled(); 134 return EventDispatchMediator::dispatchEvent(dispatcher) && !event().defaultH andled();
135 } 135 }
136 136
137 } // namespace blink 137 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/WheelEvent.h ('k') | third_party/WebKit/Source/core/fetch/DocumentResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698