Title: [97195] trunk/Source/WebCore
- Revision
- 97195
- Author
- [email protected]
- Date
- 2011-10-11 16:43:40 -0700 (Tue, 11 Oct 2011)
Log Message
[chromium] Fix compilation guards in ScrollAnimatorNone (GESTURE_EVENTS).
https://bugs.webkit.org/show_bug.cgi?id=69853
Reviewed by Kenneth Russell.
Adding missing guards ENABLE(GESTURE_EVENTS) in ScrollAnimatorNone. So
far this hasn't been a problem since GESTURE_EVENTS are usually turned on
whenever SMOOTH_SCROLLING is, but it could be a problem if this changes.
No new tests (compilation without errors is the test).
* platform/ScrollAnimatorNone.cpp:
* platform/ScrollAnimatorNone.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97194 => 97195)
--- trunk/Source/WebCore/ChangeLog 2011-10-11 23:34:37 UTC (rev 97194)
+++ trunk/Source/WebCore/ChangeLog 2011-10-11 23:43:40 UTC (rev 97195)
@@ -1,3 +1,19 @@
+2011-10-11 W. James MacLean <[email protected]>
+
+ [chromium] Fix compilation guards in ScrollAnimatorNone (GESTURE_EVENTS).
+ https://bugs.webkit.org/show_bug.cgi?id=69853
+
+ Reviewed by Kenneth Russell.
+
+ Adding missing guards ENABLE(GESTURE_EVENTS) in ScrollAnimatorNone. So
+ far this hasn't been a problem since GESTURE_EVENTS are usually turned on
+ whenever SMOOTH_SCROLLING is, but it could be a problem if this changes.
+
+ No new tests (compilation without errors is the test).
+
+ * platform/ScrollAnimatorNone.cpp:
+ * platform/ScrollAnimatorNone.h:
+
2011-10-11 Kenneth Russell <[email protected]>
[chromium] Check for lost context at beginning of compositor's execution
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (97194 => 97195)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2011-10-11 23:34:37 UTC (rev 97194)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2011-10-11 23:43:40 UTC (rev 97195)
@@ -462,6 +462,7 @@
notifyPositionChanged();
}
+#if ENABLE(GESTURE_EVENTS)
void ScrollAnimatorNone::zoom(const PlatformGestureEvent& pge)
{
ASSERT(pge.type() == PlatformGestureEvent::DoubleTapType);
@@ -503,7 +504,6 @@
}
}
-#if ENABLE(GESTURE_EVENTS)
void ScrollAnimatorNone::handleGestureEvent(const PlatformGestureEvent& pge)
{
TRACE_EVENT("ScrollAnimatorNone::handleGestureEvent", this, 0);
Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (97194 => 97195)
--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2011-10-11 23:34:37 UTC (rev 97194)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2011-10-11 23:43:40 UTC (rev 97195)
@@ -51,8 +51,10 @@
virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
virtual void scrollToOffsetWithoutAnimation(const FloatPoint&);
+#if ENABLE(GESTURE_EVENTS)
virtual void zoom(const PlatformGestureEvent&);
virtual void handleGestureEvent(const PlatformGestureEvent&);
+#endif
virtual void willEndLiveResize();
virtual void didAddVerticalScrollbar(Scrollbar*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
