Diff
Modified: trunk/Source/WebCore/ChangeLog (107822 => 107823)
--- trunk/Source/WebCore/ChangeLog 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/ChangeLog 2012-02-15 18:53:50 UTC (rev 107823)
@@ -1,3 +1,25 @@
+2012-02-15 Anders Carlsson <[email protected]>
+
+ Remove ScrollableArea::handleGestureEvent
+ https://bugs.webkit.org/show_bug.cgi?id=78661
+
+ Reviewed by Adam Roben.
+
+ 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 Stephen White <[email protected]>
Fix for incorrect/offset image in CSS filters (non-composited path)
Modified: trunk/Source/WebCore/page/EventHandler.cpp (107822 => 107823)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-02-15 18:53:50 UTC (rev 107823)
@@ -2362,16 +2362,9 @@
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();
}
Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (107822 => 107823)
--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2012-02-15 18:53:50 UTC (rev 107823)
@@ -122,12 +122,6 @@
return handled;
}
-#if ENABLE(GESTURE_EVENTS)
-void ScrollAnimator::handleGestureEvent(const PlatformGestureEvent&)
-{
-}
-#endif
-
FloatPoint ScrollAnimator::currentPosition() const
{
return FloatPoint(m_currentPosX, m_currentPosY);
Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (107822 => 107823)
--- trunk/Source/WebCore/platform/ScrollAnimator.h 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2012-02-15 18:53:50 UTC (rev 107823)
@@ -64,9 +64,6 @@
virtual void setIsActive() { }
virtual bool handleWheelEvent(const PlatformWheelEvent&);
-#if ENABLE(GESTURE_EVENTS)
- virtual void handleGestureEvent(const PlatformGestureEvent&);
-#endif
FloatPoint currentPosition() const;
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (107822 => 107823)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2012-02-15 18:53:50 UTC (rev 107823)
@@ -859,16 +859,6 @@
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();
Modified: trunk/Source/WebCore/platform/ScrollView.h (107822 => 107823)
--- trunk/Source/WebCore/platform/ScrollView.h 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/platform/ScrollView.h 2012-02-15 18:53:50 UTC (rev 107823)
@@ -239,9 +239,6 @@
// 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
{
Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (107822 => 107823)
--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-02-15 18:53:50 UTC (rev 107823)
@@ -158,13 +158,6 @@
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)
{
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (107822 => 107823)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2012-02-15 18:53:50 UTC (rev 107823)
@@ -56,9 +56,6 @@
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; }
Modified: trunk/Source/WebKit/chromium/ChangeLog (107822 => 107823)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-15 18:53:50 UTC (rev 107823)
@@ -1,3 +1,18 @@
+2012-02-15 Anders Carlsson <[email protected]>
+
+ Remove ScrollableArea::handleGestureEvent
+ https://bugs.webkit.org/show_bug.cgi?id=78661
+
+ Reviewed by Adam Roben.
+
+ Update for WebCore changes.
+
+ * src/WebPluginContainerImpl.cpp:
+ * src/WebPluginContainerImpl.h:
+ (WebPluginContainerImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::gestureEvent):
+
2012-02-14 Takashi Toyoshima <[email protected]>
Provide SocketStreamHandleInternal::toWebSocketStreamHandle(SocketStreamHandle*).
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (107822 => 107823)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-02-15 18:53:50 UTC (rev 107823)
@@ -519,17 +519,6 @@
return true;
}
-#if ENABLE(GESTURE_EVENTS)
-bool WebPluginContainerImpl::handleGestureEvent(const WebCore::PlatformGestureEvent& gestureEvent)
-{
- if (m_scrollbarGroup) {
- m_scrollbarGroup->handleGestureEvent(gestureEvent);
- return true;
- }
- return false;
-}
-#endif
-
// Private methods -------------------------------------------------------------
WebPluginContainerImpl::WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin)
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h (107822 => 107823)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h 2012-02-15 18:53:50 UTC (rev 107823)
@@ -150,10 +150,6 @@
bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&);
-#if ENABLE(GESTURE_EVENTS)
- bool handleGestureEvent(const WebCore::PlatformGestureEvent&);
-#endif
-
private:
WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin);
~WebPluginContainerImpl();
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (107822 => 107823)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-15 18:44:33 UTC (rev 107822)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-15 18:53:50 UTC (rev 107823)
@@ -612,14 +612,7 @@
bool WebViewImpl::gestureEvent(const WebGestureEvent& event)
{
PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
- bool handled = mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
-
- Frame* frame = mainFrameImpl()->frame();
- WebPluginContainerImpl* pluginContainer = WebFrameImpl::pluginContainerFromFrame(frame);
- if (pluginContainer)
- handled |= pluginContainer->handleGestureEvent(platformEvent);
-
- return handled;
+ return mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
}
void WebViewImpl::startPageScaleAnimation(const IntPoint& scroll, bool useAnchor, float newScale, double durationSec)
