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

Side by Side Diff: Source/web/WebInputEventConversion.cpp

Issue 1018183002: Add rails to input wheel events. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
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 10 * * Redistributions in binary form must reproduce the above
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 m_wheelTicksY = e.wheelTicksY; 193 m_wheelTicksY = e.wheelTicksY;
194 m_granularity = e.scrollByPage ? 194 m_granularity = e.scrollByPage ?
195 ScrollByPageWheelEvent : ScrollByPixelWheelEvent; 195 ScrollByPageWheelEvent : ScrollByPixelWheelEvent;
196 196
197 m_type = PlatformEvent::Wheel; 197 m_type = PlatformEvent::Wheel;
198 198
199 m_modifiers = toPlatformMouseEventModifiers(e.modifiers); 199 m_modifiers = toPlatformMouseEventModifiers(e.modifiers);
200 200
201 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas; 201 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;
202 m_canScroll = e.canScroll; 202 m_canScroll = e.canScroll;
203 m_railMode = static_cast<PlatformWheelEventRailMode>(e.railMode);
203 #if OS(MACOSX) 204 #if OS(MACOSX)
204 m_phase = static_cast<PlatformWheelEventPhase>(e.phase); 205 m_phase = static_cast<PlatformWheelEventPhase>(e.phase);
205 m_momentumPhase = static_cast<PlatformWheelEventPhase>(e.momentumPhase); 206 m_momentumPhase = static_cast<PlatformWheelEventPhase>(e.momentumPhase);
206 m_timestamp = e.timeStampSeconds; 207 m_timestamp = e.timeStampSeconds;
207 m_canRubberbandLeft = e.canRubberbandLeft; 208 m_canRubberbandLeft = e.canRubberbandLeft;
208 m_canRubberbandRight = e.canRubberbandRight; 209 m_canRubberbandRight = e.canRubberbandRight;
209 #endif 210 #endif
210 } 211 }
211 212
212 // PlatformGestureEventBuilder ------------------------------------------------- - 213 // PlatformGestureEventBuilder ------------------------------------------------- -
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 modifiers = getWebInputModifiers(event); 812 modifiers = getWebInputModifiers(event);
812 813
813 globalX = event.screenX(); 814 globalX = event.screenX();
814 globalY = event.screenY(); 815 globalY = event.screenY();
815 IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteL ocation(), *layoutObject); 816 IntPoint localPoint = convertAbsoluteLocationForLayoutObject(event.absoluteL ocation(), *layoutObject);
816 x = localPoint.x(); 817 x = localPoint.x();
817 y = localPoint.y(); 818 y = localPoint.y();
818 } 819 }
819 820
820 } // namespace blink 821 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698