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

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

Issue 197213011: Selectively disable rubber banding on mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Moved can_rubberband parameters into WheelEvent. Created 6 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 m_modifiers |= PlatformEvent::MetaKey; 149 m_modifiers |= PlatformEvent::MetaKey;
150 150
151 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas; 151 m_hasPreciseScrollingDeltas = e.hasPreciseScrollingDeltas;
152 #if OS(MACOSX) 152 #if OS(MACOSX)
153 m_phase = static_cast<WebCore::PlatformWheelEventPhase>(e.phase); 153 m_phase = static_cast<WebCore::PlatformWheelEventPhase>(e.phase);
154 m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(e.momentumPh ase); 154 m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(e.momentumPh ase);
155 m_timestamp = e.timeStampSeconds; 155 m_timestamp = e.timeStampSeconds;
156 m_scrollCount = 0; 156 m_scrollCount = 0;
157 m_unacceleratedScrollingDeltaX = e.deltaX; 157 m_unacceleratedScrollingDeltaX = e.deltaX;
158 m_unacceleratedScrollingDeltaY = e.deltaY; 158 m_unacceleratedScrollingDeltaY = e.deltaY;
159 m_canRubberbandLeft = e.canRubberbandLeft;
160 m_canRubberbandRight = e.canRubberbandRight;
159 #endif 161 #endif
160 } 162 }
161 163
162 // PlatformGestureEventBuilder ------------------------------------------------- - 164 // PlatformGestureEventBuilder ------------------------------------------------- -
163 165
164 PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W ebGestureEvent& e) 166 PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W ebGestureEvent& e)
165 { 167 {
166 float scale = widgetInputEventsScaleFactor(widget); 168 float scale = widgetInputEventsScaleFactor(widget);
167 IntSize offset = widgetInputEventsOffset(widget); 169 IntSize offset = widgetInputEventsOffset(widget);
168 170
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 modifiers = getWebInputModifiers(event); 766 modifiers = getWebInputModifiers(event);
765 767
766 globalX = event.screenX(); 768 globalX = event.screenX();
767 globalY = event.screenY(); 769 globalY = event.screenY();
768 IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteL ocation(), *renderObject); 770 IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteL ocation(), *renderObject);
769 x = localPoint.x(); 771 x = localPoint.x();
770 y = localPoint.y(); 772 y = localPoint.y();
771 } 773 }
772 774
773 } // namespace blink 775 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698