Commit a41c48ad authored by andersca@apple.com's avatar andersca@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.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96646 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 54555a11
2011-10-04 Anders Carlsson <andersca@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 <andersca@apple.com>
Add a ScrollElasticityController class and move some members over from ScrollAnimatorMac
......@@ -134,7 +134,7 @@ private:
bool pinnedInDirection(float deltaX, float deltaY);
void snapRubberBand();
void snapRubberBandTimerFired(Timer<ScrollAnimatorChromiumMac>*);
void smoothScrollWithEvent(PlatformWheelEvent&);
void smoothScrollWithEvent(const PlatformWheelEvent&);
void beginScrollGesture();
void endScrollGesture();
......
......@@ -771,12 +771,12 @@ static float scrollWheelMultiplier()
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 @@ bool ScrollAnimatorChromiumMac::allowsHorizontalStretching() const
return false;
}
void ScrollAnimatorChromiumMac::smoothScrollWithEvent(PlatformWheelEvent& wheelEvent)
void ScrollAnimatorChromiumMac::smoothScrollWithEvent(const PlatformWheelEvent& wheelEvent)
{
m_haveScrolledSincePageLoad = true;
......
......@@ -62,7 +62,6 @@ PlatformWheelEvent::PlatformWheelEvent(GdkEventScroll* event)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment