Changeset 142031 in webkit
- Timestamp:
- Feb 6, 2013 1:57:01 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 9 deleted
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r142026 r142031 1 2013-02-06 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142025. 4 http://trac.webkit.org/changeset/142025 5 https://bugs.webkit.org/show_bug.cgi?id=109091 6 7 broke the build (Requested by tdanderson on #webkit). 8 9 * fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed. 10 * fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html: Removed. 11 * fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed. 12 * fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html: Removed. 13 * fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed. 14 * fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html: Removed. 15 * platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed. 16 * platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed. 17 * platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed. 18 * platform/chromium/plugins/gesture-events-expected.txt: 19 * platform/chromium/plugins/gesture-events-scrolled-expected.txt: 20 * platform/chromium/plugins/gesture-events-scrolled.html: 21 * platform/chromium/plugins/gesture-events.html: 22 1 23 2013-02-06 Zan Dobersek <zdobersek@igalia.com> 2 24 -
trunk/LayoutTests/platform/chromium/plugins/gesture-events-expected.txt
r142025 r142031 7 7 Plugin received event: GestureScrollBegin 8 8 Plugin received event: GestureScrollUpdate 9 Plugin received event: GestureScrollUpdate10 9 Plugin received event: GestureScrollEnd 11 10 -
trunk/LayoutTests/platform/chromium/plugins/gesture-events-scrolled-expected.txt
r142025 r142031 6 6 Plugin received event: GestureScrollBegin 7 7 Plugin received event: GestureScrollUpdate 8 Plugin received event: GestureScrollUpdate9 8 Plugin received event: GestureScrollEnd 10 9 -
trunk/LayoutTests/platform/chromium/plugins/gesture-events-scrolled.html
r142025 r142031 36 36 eventSender.gestureScrollBegin(positionX, positionY); 37 37 eventSender.gestureScrollUpdate(30, 0); 38 eventSender.gestureScrollUpdateWithoutPropagation(30, 0);39 38 eventSender.gestureScrollEnd(0, 0); 40 39 } -
trunk/LayoutTests/platform/chromium/plugins/gesture-events.html
r142025 r142031 25 25 eventSender.gestureScrollBegin(positionX, positionY); 26 26 eventSender.gestureScrollUpdate(30, 0); 27 eventSender.gestureScrollUpdateWithoutPropagation(30, 0);28 27 eventSender.gestureScrollEnd(0, 0); 29 28 } -
trunk/Source/WebCore/ChangeLog
r142030 r142031 1 2013-02-06 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142025. 4 http://trac.webkit.org/changeset/142025 5 https://bugs.webkit.org/show_bug.cgi?id=109091 6 7 broke the build (Requested by tdanderson on #webkit). 8 9 * dom/GestureEvent.cpp: 10 (WebCore::GestureEvent::create): 11 * page/EventHandler.cpp: 12 (WebCore::EventHandler::handleGestureEvent): 13 (WebCore::EventHandler::handleGestureScrollUpdate): 14 * platform/PlatformEvent.h: 15 * platform/Scrollbar.cpp: 16 (WebCore::Scrollbar::gestureEvent): 17 * platform/chromium/PopupContainer.cpp: 18 (WebCore::PopupContainer::handleGestureEvent): 19 * rendering/RenderLayer.cpp: 20 (WebCore::RenderLayer::scrollByRecursively): 21 * rendering/RenderLayer.h: 22 1 23 2013-02-06 Mark Lam <mark.lam@apple.com> 2 24 -
trunk/Source/WebCore/dom/GestureEvent.cpp
r142025 r142031 48 48 eventType = eventNames().gesturescrollendEvent; break; 49 49 case PlatformEvent::GestureScrollUpdate: 50 case PlatformEvent::GestureScrollUpdateWithoutPropagation:51 50 eventType = eventNames().gesturescrollupdateEvent; break; 52 51 case PlatformEvent::GestureTap: -
trunk/Source/WebCore/page/EventHandler.cpp
r142025 r142031 2434 2434 Node* eventTarget = 0; 2435 2435 Scrollbar* scrollbar = 0; 2436 if (gestureEvent.type() == PlatformEvent::GestureScrollEnd 2437 || gestureEvent.type() == PlatformEvent::GestureScrollUpdate 2438 || gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation) { 2436 if (gestureEvent.type() == PlatformEvent::GestureScrollEnd || gestureEvent.type() == PlatformEvent::GestureScrollUpdate) { 2439 2437 scrollbar = m_scrollbarHandlingScrollGesture.get(); 2440 2438 eventTarget = m_scrollGestureHandlingNode.get(); … … 2498 2496 return handleGestureScrollBegin(gestureEvent); 2499 2497 case PlatformEvent::GestureScrollUpdate: 2500 case PlatformEvent::GestureScrollUpdateWithoutPropagation:2501 2498 return handleGestureScrollUpdate(gestureEvent); 2502 2499 case PlatformEvent::GestureTap: … … 2707 2704 return false; 2708 2705 2709 RenderLayer::ScrollPropagation shouldPropagate = RenderLayer::ShouldPropagateScroll;2710 if (gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation)2711 shouldPropagate = RenderLayer::DontPropagateScroll;2712 2713 2706 const float scaleFactor = m_frame->pageZoomFactor() * m_frame->frameScaleFactor(); 2714 2707 delta.scale(1 / scaleFactor, 1 / scaleFactor); 2715 2708 2716 bool result = latchedRenderer->enclosingLayer()->scrollBy (delta, RenderLayer::ScrollOffsetClamped, shouldPropagate);2709 bool result = latchedRenderer->enclosingLayer()->scrollByRecursively(delta, RenderLayer::ScrollOffsetClamped); 2717 2710 2718 2711 if (result) -
trunk/Source/WebCore/platform/PlatformEvent.h
r142025 r142031 53 53 GestureScrollEnd, 54 54 GestureScrollUpdate, 55 GestureScrollUpdateWithoutPropagation,56 55 GestureTap, 57 56 GestureTapDown, -
trunk/Source/WebCore/platform/Scrollbar.cpp
r142025 r142031 374 374 break; 375 375 case PlatformEvent::GestureScrollUpdate: 376 case PlatformEvent::GestureScrollUpdateWithoutPropagation:377 376 if (m_pressedPart == ThumbPart) { 378 377 m_scrollPos += HorizontalScrollbar ? evt.deltaX() : evt.deltaY(); -
trunk/Source/WebCore/platform/chromium/PopupContainer.cpp
r142025 r142031 322 322 case PlatformEvent::GestureDoubleTap: 323 323 break; 324 case PlatformEvent::GestureScrollUpdate: 325 case PlatformEvent::GestureScrollUpdateWithoutPropagation: { 324 case PlatformEvent::GestureScrollUpdate: { 326 325 PlatformWheelEvent syntheticWheelEvent(gestureEvent.position(), gestureEvent.globalPosition(), gestureEvent.deltaX(), gestureEvent.deltaY(), gestureEvent.deltaX() / 120.0f, gestureEvent.deltaY() / 120.0f, ScrollByPixelWheelEvent, gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey()); 327 326 handleWheelEvent(syntheticWheelEvent); -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r142025 r142031 1989 1989 } 1990 1990 1991 void RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp) 1992 { 1993 scrollBy(delta, clamp, ShouldPropagateScroll); 1994 } 1995 1996 bool RenderLayer::scrollBy(const IntSize& delta, ScrollOffsetClamping clamp, ScrollPropagation shouldPropagate) 1991 bool RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp) 1997 1992 { 1998 1993 if (delta.isZero()) … … 2006 2001 IntSize newScrollOffset = scrollOffset() + delta; 2007 2002 scrollToOffset(newScrollOffset, clamp); 2008 2009 if (shouldPropagate == DontPropagateScroll)2010 return true;2011 2003 2012 2004 // If this layer can't do the scroll we ask the next layer up that can scroll to try … … 2015 2007 if (!remainingScrollOffset.isZero() && renderer()->parent()) { 2016 2008 if (RenderLayer* scrollableLayer = enclosingScrollableLayer()) 2017 didScroll = scrollableLayer->scrollBy (remainingScrollOffset, clamp, shouldPropagate);2009 didScroll = scrollableLayer->scrollByRecursively(remainingScrollOffset, clamp); 2018 2010 2019 2011 Frame* frame = renderer()->frame(); -
trunk/Source/WebCore/rendering/RenderLayer.h
r142025 r142031 329 329 }; 330 330 331 enum ScrollPropagation {332 ShouldPropagateScroll,333 DontPropagateScroll334 };335 336 331 // Scrolling methods for layers that can scroll their overflow. 337 bool scrollBy(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped, ScrollPropagation = DontPropagateScroll); 338 void scrollByRecursively(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped); 332 bool scrollByRecursively(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped); 339 333 void scrollToOffset(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped); 340 334 void scrollToXOffset(int x, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(IntSize(x, scrollYOffset()), clamp); } -
trunk/Source/WebKit/chromium/ChangeLog
r142027 r142031 1 2013-02-06 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142025. 4 http://trac.webkit.org/changeset/142025 5 https://bugs.webkit.org/show_bug.cgi?id=109091 6 7 broke the build (Requested by tdanderson on #webkit). 8 9 * public/WebInputEvent.h: 10 (WebKit::WebInputEvent::isGestureEventType): 11 * src/PageWidgetDelegate.cpp: 12 (WebKit::PageWidgetDelegate::handleInputEvent): 13 * src/WebInputEventConversion.cpp: 14 (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder): 15 * src/WebPluginContainerImpl.cpp: 16 * src/WebPopupMenuImpl.cpp: 17 (WebKit::WebPopupMenuImpl::handleInputEvent): 18 * src/WebViewImpl.cpp: 19 (WebKit::WebViewImpl::handleGestureEvent): 20 1 21 2013-02-06 Daniel Cheng <dcheng@google.com> 2 22 -
trunk/Source/WebKit/chromium/public/WebInputEvent.h
r142025 r142031 116 116 GestureScrollEnd, 117 117 GestureScrollUpdate, 118 GestureScrollUpdateWithoutPropagation,119 118 GestureFlingStart, 120 119 GestureFlingCancel, … … 224 223 || type == GestureScrollEnd 225 224 || type == GestureScrollUpdate 226 || type == GestureScrollUpdateWithoutPropagation227 225 || type == GestureFlingStart 228 226 || type == GestureFlingCancel -
trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp
r142025 r142031 153 153 case WebInputEvent::GestureScrollEnd: 154 154 case WebInputEvent::GestureScrollUpdate: 155 case WebInputEvent::GestureScrollUpdateWithoutPropagation:156 155 case WebInputEvent::GestureFlingStart: 157 156 case WebInputEvent::GestureFlingCancel: -
trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp
r142025 r142031 154 154 m_deltaY = e.data.scrollUpdate.deltaY; 155 155 break; 156 case WebInputEvent::GestureScrollUpdateWithoutPropagation:157 m_type = PlatformEvent::GestureScrollUpdateWithoutPropagation;158 m_deltaX = e.data.scrollUpdate.deltaX;159 m_deltaY = e.data.scrollUpdate.deltaY;160 break;161 156 case WebInputEvent::GestureTap: 162 157 m_type = PlatformEvent::GestureTap; -
trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
r142025 r142031 797 797 } 798 798 799 if (webEvent.type == WebInputEvent::GestureScrollUpdate || webEvent.type == WebInputEvent::GestureScrollUpdateWithoutPropagation) {799 if (webEvent.type == WebInputEvent::GestureScrollUpdate) { 800 800 if (!m_scrollbarGroup) 801 801 return; -
trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp
r142025 r142031 274 274 case WebInputEvent::GestureScrollEnd: 275 275 case WebInputEvent::GestureScrollUpdate: 276 case WebInputEvent::GestureScrollUpdateWithoutPropagation:277 276 case WebInputEvent::GestureFlingStart: 278 277 case WebInputEvent::GestureFlingCancel: -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r142025 r142031 812 812 case WebInputEvent::GestureScrollEnd: 813 813 case WebInputEvent::GestureScrollUpdate: 814 case WebInputEvent::GestureScrollUpdateWithoutPropagation:815 814 case WebInputEvent::GestureTapCancel: 816 815 case WebInputEvent::GesturePinchEnd: -
trunk/Tools/ChangeLog
r142025 r142031 1 2013-02-06 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r142025. 4 http://trac.webkit.org/changeset/142025 5 https://bugs.webkit.org/show_bug.cgi?id=109091 6 7 broke the build (Requested by tdanderson on #webkit). 8 9 * DumpRenderTree/chromium/TestRunner/src/EventSender.cpp: 10 (WebTestRunner): 11 (WebTestRunner::EventSender::EventSender): 12 (WebTestRunner::EventSender::gestureEvent): 13 * DumpRenderTree/chromium/TestRunner/src/EventSender.h: 14 (EventSender): 15 1 16 2013-02-06 Terry Anderson <tdanderson@chromium.org> 2 17 -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp
r142025 r142031 294 294 bindMethod("gestureScrollFirstPoint", &EventSender::gestureScrollFirstPoint); 295 295 bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate); 296 bindMethod("gestureScrollUpdateWithoutPropagation", &EventSender::gestureScrollUpdateWithoutPropagation);297 296 bindMethod("gestureTap", &EventSender::gestureTap); 298 297 bindMethod("gestureTapDown", &EventSender::gestureTapDown); … … 1139 1138 } 1140 1139 1141 void EventSender::gestureScrollUpdateWithoutPropagation(const CppArgumentList& arguments, CppVariant* result)1142 {1143 result->setNull();1144 gestureEvent(WebInputEvent::GestureScrollUpdateWithoutPropagation, arguments);1145 }1146 1147 1140 void EventSender::gestureTap(const CppArgumentList& arguments, CppVariant* result) 1148 1141 { … … 1203 1196 switch (type) { 1204 1197 case WebInputEvent::GestureScrollUpdate: 1205 case WebInputEvent::GestureScrollUpdateWithoutPropagation:1206 1198 event.data.scrollUpdate.deltaX = static_cast<float>(arguments[0].toDouble()); 1207 1199 event.data.scrollUpdate.deltaY = static_cast<float>(arguments[1].toDouble()); -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h
r142025 r142031 109 109 void gestureScrollFirstPoint(const CppArgumentList&, CppVariant*); 110 110 void gestureScrollUpdate(const CppArgumentList&, CppVariant*); 111 void gestureScrollUpdateWithoutPropagation(const CppArgumentList&, CppVariant*);112 111 void gestureTap(const CppArgumentList&, CppVariant*); 113 112 void gestureTapDown(const CppArgumentList&, CppVariant*);
Note: See TracChangeset
for help on using the changeset viewer.