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

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

Issue 2246923003: Avoid integer overflow in WheelEvent constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | 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
(...skipping 16 matching lines...) Expand all
27 #include "platform/PlatformMouseEvent.h" 27 #include "platform/PlatformMouseEvent.h"
28 #include "platform/PlatformWheelEvent.h" 28 #include "platform/PlatformWheelEvent.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 inline static unsigned convertDeltaMode(const PlatformWheelEvent& event) 32 inline static unsigned convertDeltaMode(const PlatformWheelEvent& event)
33 { 33 {
34 return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::kDomDelta Page : WheelEvent::kDomDeltaPixel; 34 return event.granularity() == ScrollByPageWheelEvent ? WheelEvent::kDomDelta Page : WheelEvent::kDomDeltaPixel;
35 } 35 }
36 36
37 // Negate a long value without integer overflow.
38 inline static long negateIfPossible(long value)
39 {
40 if (value == LONG_MIN)
41 return value;
42 return -value;
43 }
44
37 WheelEvent* WheelEvent::create(const PlatformWheelEvent& event, AbstractView* vi ew) 45 WheelEvent* WheelEvent::create(const PlatformWheelEvent& event, AbstractView* vi ew)
38 { 46 {
39 return new WheelEvent(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()), 47 return new WheelEvent(FloatPoint(event.wheelTicksX(), event.wheelTicksY()), FloatPoint(event.deltaX(), event.deltaY()),
40 convertDeltaMode(event), view, event.globalPosition(), event.position(), 48 convertDeltaMode(event), view, event.globalPosition(), event.position(),
41 event.getModifiers(), 49 event.getModifiers(),
42 MouseEvent::platformModifiersToButtons(event.getModifiers()), event.time stamp(), 50 MouseEvent::platformModifiersToButtons(event.getModifiers()), event.time stamp(),
43 event.resendingPluginId(), event.hasPreciseScrollingDeltas(), 51 event.resendingPluginId(), event.hasPreciseScrollingDeltas(),
44 static_cast<Event::RailsMode>(event.getRailsMode()), 52 static_cast<Event::RailsMode>(event.getRailsMode()),
45 event.cancelable() 53 event.cancelable()
46 #if OS(MACOSX) 54 #if OS(MACOSX)
47 , static_cast<WheelEventPhase>(event.phase()), static_cast<WheelEventPha se>(event.momentumPhase()) 55 , static_cast<WheelEventPhase>(event.phase()), static_cast<WheelEventPha se>(event.momentumPhase())
48 #endif 56 #endif
49 ); 57 );
50 } 58 }
51 59
52 WheelEvent::WheelEvent() 60 WheelEvent::WheelEvent()
53 : m_deltaX(0) 61 : m_deltaX(0)
54 , m_deltaY(0) 62 , m_deltaY(0)
55 , m_deltaZ(0) 63 , m_deltaZ(0)
56 , m_deltaMode(kDomDeltaPixel) 64 , m_deltaMode(kDomDeltaPixel)
57 , m_resendingPluginId(-1) 65 , m_resendingPluginId(-1)
58 , m_hasPreciseScrollingDeltas(false) 66 , m_hasPreciseScrollingDeltas(false)
59 , m_railsMode(RailsModeFree) 67 , m_railsMode(RailsModeFree)
60 { 68 {
61 } 69 }
62 70
63 WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ er) 71 WheelEvent::WheelEvent(const AtomicString& type, const WheelEventInit& initializ er)
64 : MouseEvent(type, initializer) 72 : MouseEvent(type, initializer)
65 , m_wheelDelta(initializer.wheelDeltaX() ? initializer.wheelDeltaX() : -init ializer.deltaX(), initializer.wheelDeltaY() ? initializer.wheelDeltaY() : -initi alizer.deltaY()) 73 , m_wheelDelta(initializer.wheelDeltaX() ? initializer.wheelDeltaX() : -init ializer.deltaX(), initializer.wheelDeltaY() ? initializer.wheelDeltaY() : -initi alizer.deltaY())
66 , m_deltaX(initializer.deltaX() ? initializer.deltaX() : -initializer.wheelD eltaX()) 74 , m_deltaX(initializer.deltaX() ? initializer.deltaX() : negateIfPossible(in itializer.wheelDeltaX()))
67 , m_deltaY(initializer.deltaY() ? initializer.deltaY() : -initializer.wheelD eltaY()) 75 , m_deltaY(initializer.deltaY() ? initializer.deltaY() : negateIfPossible(in itializer.wheelDeltaY()))
68 , m_deltaZ(initializer.deltaZ()) 76 , m_deltaZ(initializer.deltaZ())
69 , m_deltaMode(initializer.deltaMode()) 77 , m_deltaMode(initializer.deltaMode())
70 , m_resendingPluginId(-1) 78 , m_resendingPluginId(-1)
71 , m_hasPreciseScrollingDeltas(false) 79 , m_hasPreciseScrollingDeltas(false)
72 , m_railsMode(RailsModeFree) 80 , m_railsMode(RailsModeFree)
73 #if OS(MACOSX) 81 #if OS(MACOSX)
74 , m_phase(WheelEventPhaseNone) 82 , m_phase(WheelEventPhaseNone)
75 , m_momentumPhase(WheelEventPhaseNone) 83 , m_momentumPhase(WheelEventPhaseNone)
76 #endif 84 #endif
77 { 85 {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 { 155 {
148 return EventDispatchMediator::create(this); 156 return EventDispatchMediator::create(this);
149 } 157 }
150 158
151 DEFINE_TRACE(WheelEvent) 159 DEFINE_TRACE(WheelEvent)
152 { 160 {
153 MouseEvent::trace(visitor); 161 MouseEvent::trace(visitor);
154 } 162 }
155 163
156 } // namespace blink 164 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698