Changeset 142031 in webkit


Ignore:
Timestamp:
Feb 6, 2013 1:57:01 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r142025.
​http://trac.webkit.org/changeset/142025
​https://bugs.webkit.org/show_bug.cgi?id=109091

broke the build (Requested by tdanderson on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-02-06

Source/WebCore:

  • dom/GestureEvent.cpp:

(WebCore::GestureEvent::create):

  • page/EventHandler.cpp:

(WebCore::EventHandler::handleGestureEvent):
(WebCore::EventHandler::handleGestureScrollUpdate):

  • platform/PlatformEvent.h:
  • platform/Scrollbar.cpp:

(WebCore::Scrollbar::gestureEvent):

  • platform/chromium/PopupContainer.cpp:

(WebCore::PopupContainer::handleGestureEvent):

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::scrollByRecursively):

  • rendering/RenderLayer.h:

Source/WebKit/chromium:

  • public/WebInputEvent.h:

(WebKit::WebInputEvent::isGestureEventType):

  • src/PageWidgetDelegate.cpp:

(WebKit::PageWidgetDelegate::handleInputEvent):

  • src/WebInputEventConversion.cpp:

(WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):

  • src/WebPluginContainerImpl.cpp:
  • src/WebPopupMenuImpl.cpp:

(WebKit::WebPopupMenuImpl::handleInputEvent):

  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::handleGestureEvent):

Tools:

  • DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:

(WebTestRunner):
(WebTestRunner::EventSender::EventSender):
(WebTestRunner::EventSender::gestureEvent):

  • DumpRenderTree/chromium/TestRunner/src/EventSender.h:

(EventSender):

LayoutTests:

  • fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed.
  • fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html: Removed.
  • fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed.
  • fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html: Removed.
  • fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed.
  • fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html: Removed.
  • platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed.
  • platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed.
  • platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed.
  • platform/chromium/plugins/gesture-events-expected.txt:
  • platform/chromium/plugins/gesture-events-scrolled-expected.txt:
  • platform/chromium/plugins/gesture-events-scrolled.html:
  • platform/chromium/plugins/gesture-events.html:
Location:
trunk
Files:
9 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r142026 r142031  
     12013-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
    1232013-02-06  Zan Dobersek  <zdobersek@igalia.com>
    224

  • trunk/LayoutTests/platform/chromium/plugins/gesture-events-expected.txt

    r142025 r142031  
    77Plugin received event: GestureScrollBegin
    88Plugin received event: GestureScrollUpdate
    9 Plugin received event: GestureScrollUpdate
    109Plugin received event: GestureScrollEnd
    1110

  • trunk/LayoutTests/platform/chromium/plugins/gesture-events-scrolled-expected.txt

    r142025 r142031  
    66Plugin received event: GestureScrollBegin
    77Plugin received event: GestureScrollUpdate
    8 Plugin received event: GestureScrollUpdate
    98Plugin received event: GestureScrollEnd
    109

  • trunk/LayoutTests/platform/chromium/plugins/gesture-events-scrolled.html

    r142025 r142031  
    3636        eventSender.gestureScrollBegin(positionX, positionY);
    3737        eventSender.gestureScrollUpdate(30, 0);
    38         eventSender.gestureScrollUpdateWithoutPropagation(30, 0);
    3938        eventSender.gestureScrollEnd(0, 0);
    4039    }

  • trunk/LayoutTests/platform/chromium/plugins/gesture-events.html

    r142025 r142031  
    2525        eventSender.gestureScrollBegin(positionX, positionY);
    2626        eventSender.gestureScrollUpdate(30, 0);
    27         eventSender.gestureScrollUpdateWithoutPropagation(30, 0);
    2827        eventSender.gestureScrollEnd(0, 0);
    2928    }

  • trunk/Source/WebCore/ChangeLog

    r142030 r142031  
     12013-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
    1232013-02-06  Mark Lam  <mark.lam@apple.com>
    224

  • trunk/Source/WebCore/dom/GestureEvent.cpp

    r142025 r142031  
    4848        eventType = eventNames().gesturescrollendEvent; break;
    4949    case PlatformEvent::GestureScrollUpdate:
    50     case PlatformEvent::GestureScrollUpdateWithoutPropagation:
    5150        eventType = eventNames().gesturescrollupdateEvent; break;
    5251    case PlatformEvent::GestureTap:

  • trunk/Source/WebCore/page/EventHandler.cpp

    r142025 r142031  
    24342434    Node* eventTarget = 0;
    24352435    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) {
    24392437        scrollbar = m_scrollbarHandlingScrollGesture.get();
    24402438        eventTarget = m_scrollGestureHandlingNode.get();
    … …  
    24982496        return handleGestureScrollBegin(gestureEvent);
    24992497    case PlatformEvent::GestureScrollUpdate:
    2500     case PlatformEvent::GestureScrollUpdateWithoutPropagation:
    25012498        return handleGestureScrollUpdate(gestureEvent);
    25022499    case PlatformEvent::GestureTap:
    … …  
    27072704        return false;
    27082705
    2709     RenderLayer::ScrollPropagation shouldPropagate = RenderLayer::ShouldPropagateScroll;
    2710     if (gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation)
    2711         shouldPropagate = RenderLayer::DontPropagateScroll;
    2712 
    27132706    const float scaleFactor = m_frame->pageZoomFactor() * m_frame->frameScaleFactor();
    27142707    delta.scale(1 / scaleFactor, 1 / scaleFactor);
    27152708
    2716     bool result = latchedRenderer->enclosingLayer()->scrollBy(delta, RenderLayer::ScrollOffsetClamped, shouldPropagate);
     2709    bool result = latchedRenderer->enclosingLayer()->scrollByRecursively(delta, RenderLayer::ScrollOffsetClamped);
    27172710
    27182711    if (result)

  • trunk/Source/WebCore/platform/PlatformEvent.h

    r142025 r142031  
    5353        GestureScrollEnd,
    5454        GestureScrollUpdate,
    55         GestureScrollUpdateWithoutPropagation,
    5655        GestureTap,
    5756        GestureTapDown,

  • trunk/Source/WebCore/platform/Scrollbar.cpp

    r142025 r142031  
    374374        break;
    375375    case PlatformEvent::GestureScrollUpdate:
    376     case PlatformEvent::GestureScrollUpdateWithoutPropagation:
    377376        if (m_pressedPart == ThumbPart) {
    378377            m_scrollPos += HorizontalScrollbar ? evt.deltaX() : evt.deltaY();

  • trunk/Source/WebCore/platform/chromium/PopupContainer.cpp

    r142025 r142031  
    322322    case PlatformEvent::GestureDoubleTap:
    323323        break;
    324     case PlatformEvent::GestureScrollUpdate:
    325     case PlatformEvent::GestureScrollUpdateWithoutPropagation: {
     324    case PlatformEvent::GestureScrollUpdate: {
    326325        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());
    327326        handleWheelEvent(syntheticWheelEvent);

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r142025 r142031  
    19891989}
    19901990
    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)
     1991bool RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp)
    19971992{
    19981993    if (delta.isZero())
    … …  
    20062001        IntSize newScrollOffset = scrollOffset() + delta;
    20072002        scrollToOffset(newScrollOffset, clamp);
    2008 
    2009         if (shouldPropagate == DontPropagateScroll)
    2010             return true;
    20112003
    20122004        // If this layer can't do the scroll we ask the next layer up that can scroll to try
    … …  
    20152007        if (!remainingScrollOffset.isZero() && renderer()->parent()) {
    20162008            if (RenderLayer* scrollableLayer = enclosingScrollableLayer())
    2017                 didScroll = scrollableLayer->scrollBy(remainingScrollOffset, clamp, shouldPropagate);
     2009                didScroll = scrollableLayer->scrollByRecursively(remainingScrollOffset, clamp);
    20182010
    20192011            Frame* frame = renderer()->frame();

  • trunk/Source/WebCore/rendering/RenderLayer.h

    r142025 r142031  
    329329    };
    330330
    331     enum ScrollPropagation {
    332         ShouldPropagateScroll,
    333         DontPropagateScroll
    334     };
    335 
    336331    // 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);
    339333    void scrollToOffset(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped);
    340334    void scrollToXOffset(int x, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(IntSize(x, scrollYOffset()), clamp); }

  • trunk/Source/WebKit/chromium/ChangeLog

    r142027 r142031  
     12013-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
    1212013-02-06  Daniel Cheng  <dcheng@google.com>
    222

  • trunk/Source/WebKit/chromium/public/WebInputEvent.h

    r142025 r142031  
    116116        GestureScrollEnd,
    117117        GestureScrollUpdate,
    118         GestureScrollUpdateWithoutPropagation,
    119118        GestureFlingStart,
    120119        GestureFlingCancel,
    … …  
    224223            || type == GestureScrollEnd
    225224            || type == GestureScrollUpdate
    226             || type == GestureScrollUpdateWithoutPropagation
    227225            || type == GestureFlingStart
    228226            || type == GestureFlingCancel

  • trunk/Source/WebKit/chromium/src/PageWidgetDelegate.cpp

    r142025 r142031  
    153153    case WebInputEvent::GestureScrollEnd:
    154154    case WebInputEvent::GestureScrollUpdate:
    155     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
    156155    case WebInputEvent::GestureFlingStart:
    157156    case WebInputEvent::GestureFlingCancel:

  • trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp

    r142025 r142031  
    154154        m_deltaY = e.data.scrollUpdate.deltaY;
    155155        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;
    161156    case WebInputEvent::GestureTap:
    162157        m_type = PlatformEvent::GestureTap;

  • trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

    r142025 r142031  
    797797    }
    798798
    799     if (webEvent.type == WebInputEvent::GestureScrollUpdate || webEvent.type == WebInputEvent::GestureScrollUpdateWithoutPropagation) {
     799    if (webEvent.type == WebInputEvent::GestureScrollUpdate) {
    800800        if (!m_scrollbarGroup)
    801801            return;

  • trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

    r142025 r142031  
    274274    case WebInputEvent::GestureScrollEnd:
    275275    case WebInputEvent::GestureScrollUpdate:
    276     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
    277276    case WebInputEvent::GestureFlingStart:
    278277    case WebInputEvent::GestureFlingCancel:

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r142025 r142031  
    812812    case WebInputEvent::GestureScrollEnd:
    813813    case WebInputEvent::GestureScrollUpdate:
    814     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
    815814    case WebInputEvent::GestureTapCancel:
    816815    case WebInputEvent::GesturePinchEnd:

  • trunk/Tools/ChangeLog

    r142025 r142031  
     12013-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
    1162013-02-06  Terry Anderson  <tdanderson@chromium.org>
    217

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp

    r142025 r142031  
    294294    bindMethod("gestureScrollFirstPoint", &EventSender::gestureScrollFirstPoint);
    295295    bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate);
    296     bindMethod("gestureScrollUpdateWithoutPropagation", &EventSender::gestureScrollUpdateWithoutPropagation);
    297296    bindMethod("gestureTap", &EventSender::gestureTap);
    298297    bindMethod("gestureTapDown", &EventSender::gestureTapDown);
    … …  
    11391138}
    11401139
    1141 void EventSender::gestureScrollUpdateWithoutPropagation(const CppArgumentList& arguments, CppVariant* result)
    1142 {
    1143     result->setNull();
    1144     gestureEvent(WebInputEvent::GestureScrollUpdateWithoutPropagation, arguments);
    1145 }
    1146 
    11471140void EventSender::gestureTap(const CppArgumentList& arguments, CppVariant* result)
    11481141{
    … …  
    12031196    switch (type) {
    12041197    case WebInputEvent::GestureScrollUpdate:
    1205     case WebInputEvent::GestureScrollUpdateWithoutPropagation:
    12061198        event.data.scrollUpdate.deltaX = static_cast<float>(arguments[0].toDouble());
    12071199        event.data.scrollUpdate.deltaY = static_cast<float>(arguments[1].toDouble());

  • trunk/Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h

    r142025 r142031  
    109109    void gestureScrollFirstPoint(const CppArgumentList&, CppVariant*);
    110110    void gestureScrollUpdate(const CppArgumentList&, CppVariant*);
    111     void gestureScrollUpdateWithoutPropagation(const CppArgumentList&, CppVariant*);
    112111    void gestureTap(const CppArgumentList&, CppVariant*);
    113112    void gestureTapDown(const CppArgumentList&, CppVariant*);
Note: See TracChangeset for help on using the changeset viewer.