https://bugs.webkit.org/show_bug.cgi?id=78661
Reviewed by Sam Weinig.
ScrollableArea::handleGestureEvent ends up being a no-op so remove it and the related code.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleGestureEvent):
* platform/ScrollAnimator.cpp:
* platform/ScrollAnimator.h:
(ScrollAnimator):
* platform/ScrollView.cpp:
(WebCore::ScrollView::wheelEvent):
* platform/ScrollView.h:
(ScrollView):
* platform/ScrollableArea.cpp:
* platform/ScrollableArea.h:
(ScrollableArea):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107774
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2012-02-14 Anders Carlsson <andersca@apple.com>
+
+ Remove ScrollableArea::handleGestureEvent
+ https://bugs.webkit.org/show_bug.cgi?id=78661
+
+ Reviewed by Sam Weinig.
+
+ ScrollableArea::handleGestureEvent ends up being a no-op so remove it and the related code.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleGestureEvent):
+ * platform/ScrollAnimator.cpp:
+ * platform/ScrollAnimator.h:
+ (ScrollAnimator):
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::wheelEvent):
+ * platform/ScrollView.h:
+ (ScrollView):
+ * platform/ScrollableArea.cpp:
+ * platform/ScrollableArea.h:
+ (ScrollableArea):
+
2012-02-14 Kentaro Hara <haraken@chromium.org>
[JSC] Cache the number of non-custom constructor arguments
return true;
}
case PlatformEvent::GestureDoubleTap:
- break;
case PlatformEvent::GestureScrollBegin:
- case PlatformEvent::GestureScrollEnd: {
- FrameView* view = m_frame->view();
- if (!view)
- return false;
-
- view->handleGestureEvent(gestureEvent);
- return true;
- }
+ case PlatformEvent::GestureScrollEnd:
+ break;
default:
ASSERT_NOT_REACHED();
}
return handled;
}
-#if ENABLE(GESTURE_EVENTS)
-void ScrollAnimator::handleGestureEvent(const PlatformGestureEvent&)
-{
-}
-#endif
-
FloatPoint ScrollAnimator::currentPosition() const
{
return FloatPoint(m_currentPosX, m_currentPosY);
virtual void setIsActive() { }
virtual bool handleWheelEvent(const PlatformWheelEvent&);
-#if ENABLE(GESTURE_EVENTS)
- virtual void handleGestureEvent(const PlatformGestureEvent&);
-#endif
FloatPoint currentPosition() const;
return ScrollableArea::handleWheelEvent(e);
}
-#if ENABLE(GESTURE_EVENTS)
-void ScrollView::gestureEvent(const PlatformGestureEvent& gestureEvent)
-{
- if (platformWidget())
- return;
-
- ScrollableArea::handleGestureEvent(gestureEvent);
-}
-#endif
-
void ScrollView::setFrameRect(const IntRect& newRect)
{
IntRect oldRect = frameRect();
// On Mac the underlying NSScrollView just does the scrolling, but on other platforms
// (like Windows), we need this function in order to do the scroll ourselves.
bool wheelEvent(const PlatformWheelEvent&);
-#if ENABLE(GESTURE_EVENTS)
- void gestureEvent(const PlatformGestureEvent&);
-#endif
IntPoint convertChildToSelf(const Widget* child, const IntPoint& point) const
{
return scrollAnimator()->handleWheelEvent(wheelEvent);
}
-#if ENABLE(GESTURE_EVENTS)
-void ScrollableArea::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
-{
- scrollAnimator()->handleGestureEvent(gestureEvent);
-}
-#endif
-
// NOTE: Only called from Internals for testing.
void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset)
{
virtual bool requestScrollPositionUpdate(const IntPoint&) { return false; }
bool handleWheelEvent(const PlatformWheelEvent&);
-#if ENABLE(GESTURE_EVENTS)
- void handleGestureEvent(const PlatformGestureEvent&);
-#endif
// Functions for controlling if you can scroll past the end of the document.
bool constrainsScrollingToContentEdge() const { return m_constrainsScrollingToContentEdge; }