Changeset 107036 in webkit


Ignore:
Timestamp:
Feb 7, 2012 9:06:33 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Source/JavaScriptCore: [chromium] Remove the enable marcro for the no longer necessary Chromium
gesture recognizer.
​https://bugs.webkit.org/show_bug.cgi?id=77492

Patch by Robert Kroeger <​rjkroege@chromium.org> on 2012-02-07
Reviewed by Adam Barth.

  • wtf/Platform.h:

Source/WebCore: [chromium] Remove the no longer necessary Chromium gesture recognizer.
​https://bugs.webkit.org/show_bug.cgi?id=77492

Patch by Robert Kroeger <​rjkroege@chromium.org> on 2012-02-07
Reviewed by Adam Barth.

  • WebCore.gypi:
  • platform/PlatformGestureRecognizer.h: Removed.
  • platform/chromium/FramelessScrollView.h:

(WebCore):
(FramelessScrollView):

  • platform/chromium/GestureRecognizerChromium.cpp: Removed.
  • platform/chromium/GestureRecognizerChromium.h: Removed.
  • platform/chromium/PopupContainer.cpp:

(WebCore):

  • platform/chromium/PopupContainer.h:
  • platform/chromium/PopupListBox.cpp:

(WebCore):

  • platform/chromium/PopupListBox.h:

(PopupListBox):

Source/WebKit: [chromium] Remove no longer necessary Chromium gesture recognizer code.
​https://bugs.webkit.org/show_bug.cgi?id=77492

Patch by Robert Kroeger <​rjkroege@chromium.org> on 2012-02-07
Reviewed by Adam Barth.

  • blackberry/WebCoreSupport/AboutDataEnableFeatures.in:

Source/WebKit/chromium: [chromium] Remove no longer necessary Chromium gesture recognizer code.
​https://bugs.webkit.org/show_bug.cgi?id=77492

Patch by Robert Kroeger <​rjkroege@chromium.org> on 2012-02-07
Reviewed by Adam Barth.

  • WebKit.gypi:
  • features.gypi:
  • src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::createFrameView):

  • src/WebPopupMenuImpl.cpp:

(WebKit::WebPopupMenuImpl::WebPopupMenuImpl):
(WebKit::WebPopupMenuImpl::handleTouchEvent):

  • src/WebPopupMenuImpl.h:
  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):
(WebKit::WebViewImpl::touchEvent):

  • src/WebViewImpl.h:

(WebCore):
(WebViewImpl):

  • tests/InnerGestureRecognizerTest.cpp: Removed.

LayoutTests: [chromium] Remove unnecessary Chromium gesture recognizer tests.
​https://bugs.webkit.org/show_bug.cgi?id=77492

Patch by Robert Kroeger <​rjkroege@chromium.org> on 2012-02-07
Reviewed by Adam Barth.

  • fast/events/touch/page-scaled-touch-gesture-click-expected.txt:
  • fast/events/touch/page-scaled-touch-gesture-click.html:
  • fast/events/touch/touch-gesture-click-expected.txt: Removed.
  • fast/events/touch/touch-gesture-click.html: Removed.
  • fast/events/touch/touch-gesture-scroll-expected.txt: Removed.
  • fast/events/touch/touch-gesture-scroll.html: Removed.
  • platform/chromium/fast/events/touch/touch-gesture-click-expected.txt: Removed.
  • platform/chromium/fast/events/touch/touch-gesture-scroll-expected.txt: Removed.
Location:
trunk
Files:
10 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r107035 r107036  
     12012-02-07  Robert Kroeger  <rjkroege@chromium.org>
     2
     3        [chromium] Remove unnecessary Chromium gesture recognizer tests.
     4        https://bugs.webkit.org/show_bug.cgi?id=77492
     5
     6        Reviewed by Adam Barth.
     7
     8        * fast/events/touch/page-scaled-touch-gesture-click-expected.txt:
     9        * fast/events/touch/page-scaled-touch-gesture-click.html:
     10        * fast/events/touch/touch-gesture-click-expected.txt: Removed.
     11        * fast/events/touch/touch-gesture-click.html: Removed.
     12        * fast/events/touch/touch-gesture-scroll-expected.txt: Removed.
     13        * fast/events/touch/touch-gesture-scroll.html: Removed.
     14        * platform/chromium/fast/events/touch/touch-gesture-click-expected.txt: Removed.
     15        * platform/chromium/fast/events/touch/touch-gesture-scroll-expected.txt: Removed.
     16
    1172012-02-07  Erik Arvidsson  <arv@chromium.org>
    218

  • trunk/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click-expected.txt

    r97988 r107036  
    44
    55
    6 have received: 1 touch events
    7 have received: 2 touch events
    86PASS event.type is "mousemove"
    97PASS event.clientX is 20
    108PASS event.clientY is 24
    11 PASS event.shiftKey is true
    12 PASS event.altKey is true
     9PASS event.shiftKey is false
     10PASS event.altKey is false
    1311PASS event.ctrlKey is false
    1412PASS event.metaKey is false
    … …  
    1614PASS event.clientX is 20
    1715PASS event.clientY is 24
    18 PASS event.shiftKey is true
    19 PASS event.altKey is true
     16PASS event.shiftKey is false
     17PASS event.altKey is false
    2018PASS event.ctrlKey is false
    2119PASS event.metaKey is false
    … …  
    2321PASS event.clientX is 20
    2422PASS event.clientY is 24
    25 PASS event.shiftKey is true
    26 PASS event.altKey is true
     23PASS event.shiftKey is false
     24PASS event.altKey is false
    2725PASS event.ctrlKey is false
    2826PASS event.metaKey is false
    … …  
    3028PASS event.clientX is 20
    3129PASS event.clientY is 24
    32 PASS event.shiftKey is true
    33 PASS event.altKey is true
     30PASS event.shiftKey is false
     31PASS event.altKey is false
    3432PASS event.ctrlKey is false
    3533PASS event.metaKey is false

  • trunk/LayoutTests/fast/events/touch/page-scaled-touch-gesture-click.html

    r105900 r107036  
    2020var clickEventsReceived = 0;
    2121var expectedMouseEvents = 4;
    22 var touchEventsReceived = 0;
    2322var mouseEventsReceived = 0;
    2423var eventTypes = [ 'mousemove', 'mousedown', 'mouseup', 'click' ];
    … …  
    3029        shouldBe('event.clientX', '20');
    3130        shouldBe('event.clientY', '24');
    32         shouldBe("event.shiftKey", "true");
    33         shouldBe("event.altKey", "true");
     31        shouldBe("event.shiftKey", "false");
     32        shouldBe("event.altKey", "false");
    3433        shouldBe("event.ctrlKey", "false");
    3534        shouldBe("event.metaKey", "false");
    … …  
    5554}
    5655
    57 function singleTouchSequence()
    58 {
    59     eventSender.clearTouchPoints();
    60     // Coordinates passed to eventSender.addTouchPoint are in screen pixels,
    61     // relative to the top left of the window.
    62     eventSender.addTouchPoint(10, 12);
    63     eventSender.touchStart();
    64 
    65     // Insert some delay. NB: this value depends on minClickDownTime,
    66     // maxClickDownTime from GestureRecognizerChromium.cpp
    67     eventSender.leapForward(20);
    68     eventSender.setTouchModifier("shift", true);
    69     eventSender.setTouchModifier("alt", true);
    70 
    71     eventSender.releaseTouchPoint(0);
    72     eventSender.touchEnd();
    73 }
    74 
    7556function endTest()
    7657{
    … …  
    9475    div.addEventListener("mousemove", gestureEventCallback, false);
    9576    document.addEventListener("keydown", quitKeyToEndTest, false);
    96     div.addEventListener("touchstart", touchEventCallback, false);
    97     div.addEventListener("touchmove", touchEventCallback, false);
    98     div.addEventListener("touchend", touchEventCallback, false);
    9977
    10078    if (window.layoutTestController)
    … …  
    10482        description("This tests basic single touch gesture generation.");
    10583        if (eventSender.clearTouchPoints) {
    106             singleTouchSequence();
     84            eventSender.gestureTap(10, 12);
    10785            eventSender.leapForward(10);
    10886            eventSender.keyDown(' ');

  • trunk/Source/JavaScriptCore/ChangeLog

    r107026 r107036  
     12012-02-07  Robert Kroeger  <rjkroege@chromium.org>
     2
     3        [chromium] Remove the enable marcro for the no longer necessary Chromium
     4        gesture recognizer.
     5        https://bugs.webkit.org/show_bug.cgi?id=77492
     6
     7        Reviewed by Adam Barth.
     8
     9        * wtf/Platform.h:
     10
    1112012-02-07  Tony Chang  <tony@chromium.org>
    212

  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r106978 r107036  
    860860#endif
    861861
    862 #if !defined(ENABLE_GESTURE_RECOGNIZER)
    863 #define ENABLE_GESTURE_RECOGNIZER 0
    864 #endif
    865 
    866862#if !defined(ENABLE_VIEWPORT)
    867863#define ENABLE_VIEWPORT 0

  • trunk/Source/WebCore/ChangeLog

    r107035 r107036  
     12012-02-07  Robert Kroeger  <rjkroege@chromium.org>
     2
     3        [chromium] Remove the no longer necessary Chromium gesture recognizer.
     4        https://bugs.webkit.org/show_bug.cgi?id=77492
     5
     6        Reviewed by Adam Barth.
     7
     8        * WebCore.gypi:
     9        * platform/PlatformGestureRecognizer.h: Removed.
     10        * platform/chromium/FramelessScrollView.h:
     11        (WebCore):
     12        (FramelessScrollView):
     13        * platform/chromium/GestureRecognizerChromium.cpp: Removed.
     14        * platform/chromium/GestureRecognizerChromium.h: Removed.
     15        * platform/chromium/PopupContainer.cpp:
     16        (WebCore):
     17        * platform/chromium/PopupContainer.h:
     18        * platform/chromium/PopupListBox.cpp:
     19        (WebCore):
     20        * platform/chromium/PopupListBox.h:
     21        (PopupListBox):
     22
    1232012-02-07  Erik Arvidsson  <arv@chromium.org>
    224

  • trunk/Source/WebCore/WebCore.gypi

    r107035 r107036  
    277277            'platform/PlatformEvent.h',
    278278            'platform/PlatformGestureEvent.h',
    279             'platform/PlatformGestureRecognizer.h',
    280279            'platform/PlatformKeyboardEvent.h',
    281280            'platform/PlatformMenuDescription.h',
    … …  
    29092908            'platform/chromium/FramelessScrollViewClient.h',
    29102909            'platform/chromium/GamepadsChromium.cpp',
    2911             'platform/chromium/GestureRecognizerChromium.cpp',
    2912             'platform/chromium/GestureRecognizerChromium.h',
    29132910            'platform/chromium/HistogramSupportChromium.cpp',
    29142911            'platform/chromium/KeyCodeConversion.h',

  • trunk/Source/WebCore/platform/chromium/FramelessScrollView.h

    r96348 r107036  
    3737
    3838    class FramelessScrollViewClient;
    39 #if ENABLE(GESTURE_RECOGNIZER)
     39#if ENABLE(GESTURE_EVENTS)
    4040    class PlatformGestureEvent;
    4141#endif
    … …  
    7070        virtual bool handleTouchEvent(const PlatformTouchEvent&) = 0;
    7171#endif
    72 #if ENABLE(GESTURE_RECOGNIZER)
     72#if ENABLE(GESTURE_EVENTS)
    7373        virtual bool handleGestureEvent(const PlatformGestureEvent&) = 0;
    7474#endif

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

    r103297 r107036  
    293293#endif
    294294
    295 #if ENABLE(GESTURE_RECOGNIZER)
     295#if ENABLE(GESTURE_EVENTS)
    296296// FIXME: Refactor this code to share functionality with EventHandler::handleGestureEvent.
    297297bool PopupContainer::handleGestureEvent(const PlatformGestureEvent& gestureEvent)

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

    r95901 r107036  
    6666    virtual bool handleTouchEvent(const PlatformTouchEvent&);
    6767#endif
    68 #if ENABLE(GESTURE_RECOGNIZER)
     68#if ENABLE(GESTURE_EVENTS)
    6969    virtual bool handleGestureEvent(const PlatformGestureEvent&);
    7070#endif

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

    r103297 r107036  
    187187#endif
    188188
    189 #if ENABLE(GESTURE_RECOGNIZER)
     189#if ENABLE(GESTURE_EVENTS)
    190190bool PopupListBox::handleGestureEvent(const PlatformGestureEvent&)
    191191{

  • trunk/Source/WebCore/platform/chromium/PopupListBox.h

    r95901 r107036  
    124124    virtual bool handleTouchEvent(const PlatformTouchEvent&);
    125125#endif
    126 #if ENABLE(GESTURE_RECOGNIZER)
     126#if ENABLE(GESTURE_EVENTS)
    127127    virtual bool handleGestureEvent(const PlatformGestureEvent&);
    128128#endif

  • trunk/Source/WebKit/ChangeLog

    r107033 r107036  
     12012-02-07  Robert Kroeger  <rjkroege@chromium.org>
     2
     3        [chromium] Remove no longer necessary Chromium gesture recognizer code.
     4        https://bugs.webkit.org/show_bug.cgi?id=77492
     5
     6        Reviewed by Adam Barth.
     7
     8        * blackberry/WebCoreSupport/AboutDataEnableFeatures.in:
     9
    1102012-02-07  Leo Yang  <leo.yang@torchmobile.com.cn>
    211

  • trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in

    r102207 r107036  
    4545GEOLOCATION
    4646GESTURE_EVENTS
    47 GESTURE_RECOGNIZER
    4847GGC
    4948GLIB_SUPPORT

  • trunk/Source/WebKit/chromium/ChangeLog

    r107014 r107036  
     12012-02-07  Robert Kroeger  <rjkroege@chromium.org>
     2
     3        [chromium] Remove no longer necessary Chromium gesture recognizer code.
     4        https://bugs.webkit.org/show_bug.cgi?id=77492
     5
     6        Reviewed by Adam Barth.
     7
     8        * WebKit.gypi:
     9        * features.gypi:
     10        * src/WebFrameImpl.cpp:
     11        (WebKit::WebFrameImpl::createFrameView):
     12        * src/WebPopupMenuImpl.cpp:
     13        (WebKit::WebPopupMenuImpl::WebPopupMenuImpl):
     14        (WebKit::WebPopupMenuImpl::handleTouchEvent):
     15        * src/WebPopupMenuImpl.h:
     16        * src/WebViewImpl.cpp:
     17        (WebKit::WebViewImpl::WebViewImpl):
     18        (WebKit::WebViewImpl::touchEvent):
     19        * src/WebViewImpl.h:
     20        (WebCore):
     21        (WebViewImpl):
     22        * tests/InnerGestureRecognizerTest.cpp: Removed.
     23
    1242012-02-07  David Reveman  <reveman@chromium.org>
    225

  • trunk/Source/WebKit/chromium/WebKit.gypi

    r106399 r107036  
    9797            'tests/IDBKeyPathTest.cpp',
    9898            'tests/IDBLevelDBCodingTest.cpp',
    99             'tests/InnerGestureRecognizerTest.cpp',
    10099            'tests/KeyboardTest.cpp',
    101100            'tests/KURLTest.cpp',

  • trunk/Source/WebKit/chromium/features.gypi

    r105500 r107036  
    5151      'ENABLE_GEOLOCATION=1',
    5252      'ENABLE_GESTURE_EVENTS=1',
    53       'ENABLE_GESTURE_RECOGNIZER=1',
    5453      'ENABLE_ICONDATABASE=0',
    5554      'ENABLE_INDEXED_DATABASE=1',

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

    r106554 r107036  
    21062106    if (webView->shouldAutoResize() && isMainFrame)
    21072107        m_frame->view()->enableAutoSizeMode(true, webView->minAutoSize(), webView->maxAutoSize());
    2108 
    2109 #if ENABLE(GESTURE_RECOGNIZER)
    2110     webView->resetGestureRecognizer();
    2111 #endif
    21122108}
    21132109

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

    r106084 r107036  
    5252#include <skia/ext/platform_canvas.h>
    5353
    54 #if ENABLE(GESTURE_RECOGNIZER)
     54#if ENABLE(GESTURE_EVENTS)
    5555#include "PlatformGestureEvent.h"
    56 #include "PlatformGestureRecognizer.h"
    5756#endif
    5857
    … …  
    7473    : m_client(client)
    7574    , m_widget(0)
    76 #if ENABLE(GESTURE_RECOGNIZER)
    77     , m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create())
    78 #endif
    7975{
    8076    // Set to impossible point so we always get the first mouse position.
    … …  
    144140    PlatformTouchEventBuilder touchEventBuilder(m_widget, event);
    145141    bool defaultPrevented(m_widget->handleTouchEvent(touchEventBuilder));
    146 #if ENABLE(GESTURE_RECOGNIZER)
    147     OwnPtr<Vector<WebCore::PlatformGestureEvent> > gestureEvents(m_gestureRecognizer->processTouchEventForGestures(touchEventBuilder, defaultPrevented));
    148     for (unsigned int  i = 0; i < gestureEvents->size(); i++)
    149         m_widget->handleGestureEvent((*gestureEvents)[i]);
    150 #endif
    151142    return defaultPrevented;
    152143}

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

    r106084 r107036  
    140140    // before it is destroyed.
    141141    WebCore::FramelessScrollView* m_widget;
    142 
    143 #if ENABLE(GESTURE_RECOGNIZER)
    144     OwnPtr<WebCore::PlatformGestureRecognizer> m_gestureRecognizer;
    145 #endif
    146142};
    147143

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

    r106951 r107036  
    149149#endif
    150150
    151 #if ENABLE(GESTURE_RECOGNIZER)
    152 #include "PlatformGestureRecognizer.h"
    153 #endif
    154 
    155151#if USE(CG)
    156152#include <CoreGraphics/CGBitmapContext.h>
    … …  
    376372    , m_deviceOrientationClientProxy(adoptPtr(new DeviceOrientationClientProxy(client ? client->deviceOrientationClient() : 0)))
    377373    , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? client->geolocationClient() : 0)))
    378 #if ENABLE(GESTURE_RECOGNIZER)
    379     , m_gestureRecognizer(WebCore::PlatformGestureRecognizer::create())
    380 #endif
    381374#if ENABLE(MEDIA_STREAM)
    382375    , m_userMediaClientImpl(this)
    … …  
    801794    PlatformTouchEventBuilder touchEventBuilder(mainFrameImpl()->frameView(), event);
    802795    bool defaultPrevented = mainFrameImpl()->frame()->eventHandler()->handleTouchEvent(touchEventBuilder);
    803 
    804 #if ENABLE(GESTURE_RECOGNIZER)
    805     OwnPtr<Vector<WebCore::PlatformGestureEvent> > gestureEvents(m_gestureRecognizer->processTouchEventForGestures(touchEventBuilder, defaultPrevented));
    806     for (unsigned int  i = 0; i < gestureEvents->size(); i++)
    807         mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(gestureEvents->at(i));
    808 #endif
    809 
    810796    return defaultPrevented;
    811797}
    … …  
    31813167}
    31823168
    3183 #if ENABLE(GESTURE_RECOGNIZER)
    3184 void WebViewImpl::resetGestureRecognizer()
    3185 {
    3186     m_gestureRecognizer->reset();
    3187 }
    3188 #endif
    3189 
    31903169#if ENABLE(POINTER_LOCK)
    31913170bool WebViewImpl::requestPointerLock()

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

    r106951 r107036  
    6969class RenderTheme;
    7070class Widget;
    71 #if ENABLE(GESTURE_RECOGNIZER)
    72 class PlatformGestureRecognizer;
    73 #endif
    7471}
    7572
    … …  
    459456    void fullFramePluginZoomLevelChanged(double zoomLevel);
    460457
    461 #if ENABLE(GESTURE_RECOGNIZER)
    462     void resetGestureRecognizer();
    463 #endif
    464 
    465458    void loseCompositorContext(int numTimes);
    466459
    … …  
    691684    OwnPtr<GeolocationClientProxy> m_geolocationClientProxy;
    692685
    693 #if ENABLE(GESTURE_RECOGNIZER)
    694     OwnPtr<WebCore::PlatformGestureRecognizer> m_gestureRecognizer;
    695 #endif
    696 
    697686#if ENABLE(MEDIA_STREAM)
    698687    UserMediaClientImpl m_userMediaClientImpl;
Note: See TracChangeset for help on using the changeset viewer.