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

Side by Side Diff: Source/WebCore/platform/PlatformWheelEvent.h

Issue 12817006: Merge 144519 "EventHandler::handleGestureScrollUpdate() should i..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 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
« no previous file with comments | « Source/WebCore/page/EventHandler.cpp ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('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) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2009 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #if PLATFORM(GTK) 150 #if PLATFORM(GTK)
151 explicit PlatformWheelEvent(GdkEventScroll*); 151 explicit PlatformWheelEvent(GdkEventScroll*);
152 #endif 152 #endif
153 153
154 #if PLATFORM(EFL) 154 #if PLATFORM(EFL)
155 explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*); 155 explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
156 #endif 156 #endif
157 157
158 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) 158 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
159 bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDel tas; } 159 bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDel tas; }
160 void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
160 #endif 161 #endif
161 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) 162 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
162 PlatformWheelEventPhase phase() const { return m_phase; } 163 PlatformWheelEventPhase phase() const { return m_phase; }
163 PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; } 164 PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
164 unsigned scrollCount() const { return m_scrollCount; } 165 unsigned scrollCount() const { return m_scrollCount; }
165 float unacceleratedScrollingDeltaX() const { return m_unacceleratedScrol lingDeltaX; } 166 float unacceleratedScrollingDeltaX() const { return m_unacceleratedScrol lingDeltaX; }
166 float unacceleratedScrollingDeltaY() const { return m_unacceleratedScrol lingDeltaY; } 167 float unacceleratedScrollingDeltaY() const { return m_unacceleratedScrol lingDeltaY; }
167 bool useLatchedEventNode() const { return m_useLatchedEventNode || (m_mo mentumPhase == PlatformWheelEventPhaseBegan || m_momentumPhase == PlatformWheelE ventPhaseChanged); } 168 bool useLatchedEventNode() const { return m_useLatchedEventNode || (m_mo mentumPhase == PlatformWheelEventPhaseBegan || m_momentumPhase == PlatformWheelE ventPhaseChanged); }
168 #else 169 #else
169 bool useLatchedEventNode() const { return m_useLatchedEventNode; } 170 bool useLatchedEventNode() const { return m_useLatchedEventNode; }
(...skipping 26 matching lines...) Expand all
196 PlatformWheelEventPhase m_momentumPhase; 197 PlatformWheelEventPhase m_momentumPhase;
197 unsigned m_scrollCount; 198 unsigned m_scrollCount;
198 float m_unacceleratedScrollingDeltaX; 199 float m_unacceleratedScrollingDeltaX;
199 float m_unacceleratedScrollingDeltaY; 200 float m_unacceleratedScrollingDeltaY;
200 #endif 201 #endif
201 }; 202 };
202 203
203 } // namespace WebCore 204 } // namespace WebCore
204 205
205 #endif // PlatformWheelEvent_h 206 #endif // PlatformWheelEvent_h
OLDNEW
« no previous file with comments | « Source/WebCore/page/EventHandler.cpp ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698