Title: [96646] trunk/Source/WebCore
- Revision
- 96646
- Author
- ander...@apple.com
- Date
- 2011-10-04 14:25:27 -0700 (Tue, 04 Oct 2011)
Log Message
Build fixes for everyone.
* platform/chromium/ScrollAnimatorChromiumMac.h:
* platform/chromium/ScrollAnimatorChromiumMac.mm:
(WebCore::isScrollingLeftAndShouldNotRubberBand):
(WebCore::isScrollingRightAndShouldNotRubberBand):
(WebCore::ScrollAnimatorChromiumMac::smoothScrollWithEvent):
Fix Chromium build.
* platform/gtk/PlatformWheelEventGtk.cpp:
(WebCore::PlatformWheelEvent::PlatformWheelEvent):
Fix GTK+ build.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96645 => 96646)
--- trunk/Source/WebCore/ChangeLog 2011-10-04 21:23:29 UTC (rev 96645)
+++ trunk/Source/WebCore/ChangeLog 2011-10-04 21:25:27 UTC (rev 96646)
@@ -1,5 +1,20 @@
2011-10-04 Anders Carlsson <ander...@apple.com>
+ Build fixes for everyone.
+
+ * platform/chromium/ScrollAnimatorChromiumMac.h:
+ * platform/chromium/ScrollAnimatorChromiumMac.mm:
+ (WebCore::isScrollingLeftAndShouldNotRubberBand):
+ (WebCore::isScrollingRightAndShouldNotRubberBand):
+ (WebCore::ScrollAnimatorChromiumMac::smoothScrollWithEvent):
+ Fix Chromium build.
+
+ * platform/gtk/PlatformWheelEventGtk.cpp:
+ (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+ Fix GTK+ build.
+
+2011-10-04 Anders Carlsson <ander...@apple.com>
+
Add a ScrollElasticityController class and move some members over from ScrollAnimatorMac
https://bugs.webkit.org/show_bug.cgi?id=69373
Modified: trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.h (96645 => 96646)
--- trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.h 2011-10-04 21:23:29 UTC (rev 96645)
+++ trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.h 2011-10-04 21:25:27 UTC (rev 96646)
@@ -134,7 +134,7 @@
bool pinnedInDirection(float deltaX, float deltaY);
void snapRubberBand();
void snapRubberBandTimerFired(Timer<ScrollAnimatorChromiumMac>*);
- void smoothScrollWithEvent(PlatformWheelEvent&);
+ void smoothScrollWithEvent(const PlatformWheelEvent&);
void beginScrollGesture();
void endScrollGesture();
Modified: trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm (96645 => 96646)
--- trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm 2011-10-04 21:23:29 UTC (rev 96645)
+++ trunk/Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm 2011-10-04 21:25:27 UTC (rev 96646)
@@ -771,12 +771,12 @@
return multiplier;
}
-static inline bool isScrollingLeftAndShouldNotRubberBand(PlatformWheelEvent& wheelEvent, ScrollableArea* scrollableArea)
+static inline bool isScrollingLeftAndShouldNotRubberBand(const PlatformWheelEvent& wheelEvent, ScrollableArea* scrollableArea)
{
return wheelEvent.deltaX() > 0 && !scrollableArea->shouldRubberBandInDirection(ScrollLeft);
}
-static inline bool isScrollingRightAndShouldNotRubberBand(PlatformWheelEvent& wheelEvent, ScrollableArea* scrollableArea)
+static inline bool isScrollingRightAndShouldNotRubberBand(const PlatformWheelEvent& wheelEvent, ScrollableArea* scrollableArea)
{
return wheelEvent.deltaX() < 0 && !scrollableArea->shouldRubberBandInDirection(ScrollRight);
}
@@ -911,7 +911,7 @@
return false;
}
-void ScrollAnimatorChromiumMac::smoothScrollWithEvent(PlatformWheelEvent& wheelEvent)
+void ScrollAnimatorChromiumMac::smoothScrollWithEvent(const PlatformWheelEvent& wheelEvent)
{
m_haveScrolledSincePageLoad = true;
Modified: trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp (96645 => 96646)
--- trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp 2011-10-04 21:23:29 UTC (rev 96645)
+++ trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp 2011-10-04 21:25:27 UTC (rev 96646)
@@ -62,7 +62,6 @@
m_position = IntPoint(static_cast<int>(event->x), static_cast<int>(event->y));
m_globalPosition = IntPoint(static_cast<int>(event->x_root), static_cast<int>(event->y_root));
m_granularity = ScrollByPixelWheelEvent;
- m_isAccepted = false;
m_shiftKey = event->state & GDK_SHIFT_MASK;
m_ctrlKey = event->state & GDK_CONTROL_MASK;
m_altKey = event->state & GDK_MOD1_MASK;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
