Changeset 68499 in webkit


Ignore:
Timestamp:
Sep 28, 2010 2:26:31 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-09-28 Huahui Wu <​mediadependent@gmail.com>

Reviewed by Steve Block.

Add two multi-touch tests for Android.
​https://bugs.webkit.org/show_bug.cgi?id=45221

The original tests (touch-target.html and basic-multi-touch-events.html)
requires the system being able to release one point while maintain another point.
Current Android system can not provide this to browser, hence these tests are
slightly modified for Android. Since these are limited version of the original ones,
other platforms should pass these tests if they can pass the original ones.

  • fast/events/touch/basic-multi-touch-events-limited-expected.txt: Added.
  • fast/events/touch/basic-multi-touch-events-limited.html: Added.
  • fast/events/touch/script-tests/basic-multi-touch-events-limited.js: Added. (touchEventCallback): (verifyTouchEvent): (verifyTouchPoint): (verifyTouch): (multiTouchSequence):
  • fast/events/touch/script-tests/touch-target-limited.js: Added. (touchStartHandler): (touchMoveHandler):
  • fast/events/touch/touch-target-limited-expected.txt: Added.
  • fast/events/touch/touch-target-limited.html: Added.

2010-09-28 Huahui Wu <​mediadependent@gmail.com>

Reviewed by Steve Block.

Add multi-touch for Android.
​https://bugs.webkit.org/show_bug.cgi?id=45221

The Android touch event used to take one point as the touch point,
it's now changed to a vector of points to support multi-touch.

Tests: fast/events/touch/basic-multi-touch-events-limited.html

fast/events/touch/touch-target-limited.html

  • platform/PlatformTouchEvent.h:
  • platform/PlatformTouchPoint.h:
  • platform/android/PlatformTouchEventAndroid.cpp: (WebCore::PlatformTouchEvent::PlatformTouchEvent):
  • platform/android/PlatformTouchPointAndroid.cpp: (WebCore::PlatformTouchPoint::PlatformTouchPoint):
Location:
trunk
Files:
6 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r68498 r68499  
     12010-09-28  Huahui Wu  <mediadependent@gmail.com>
     2
     3        Reviewed by Steve Block.
     4
     5        Add two multi-touch tests for Android.
     6        https://bugs.webkit.org/show_bug.cgi?id=45221
     7
     8        The original tests (touch-target.html and basic-multi-touch-events.html)
     9        requires the system being able to release one point while maintain another point.
     10        Current Android system can not provide this to browser, hence these tests are
     11        slightly modified for Android. Since these are limited version of the original ones,
     12        other platforms should pass these tests if they can pass the original ones.
     13
     14        * fast/events/touch/basic-multi-touch-events-limited-expected.txt: Added.
     15        * fast/events/touch/basic-multi-touch-events-limited.html: Added.
     16        * fast/events/touch/script-tests/basic-multi-touch-events-limited.js: Added.
     17        (touchEventCallback):
     18        (verifyTouchEvent):
     19        (verifyTouchPoint):
     20        (verifyTouch):
     21        (multiTouchSequence):
     22        * fast/events/touch/script-tests/touch-target-limited.js: Added.
     23        (touchStartHandler):
     24        (touchMoveHandler):
     25        * fast/events/touch/touch-target-limited-expected.txt: Added.
     26        * fast/events/touch/touch-target-limited.html: Added.
     27
    1282010-09-28 MORITA Hajime  <morrita@google.com>
    229

  • trunk/WebCore/ChangeLog

    r68494 r68499  
     12010-09-28  Huahui Wu  <mediadependent@gmail.com>
     2
     3        Reviewed by Steve Block.
     4
     5        Add multi-touch for Android.
     6        https://bugs.webkit.org/show_bug.cgi?id=45221
     7
     8        The Android touch event used to take one point as the touch point,
     9        it's now changed to a vector of points to support multi-touch.
     10
     11        Tests: fast/events/touch/basic-multi-touch-events-limited.html
     12               fast/events/touch/touch-target-limited.html
     13
     14        * platform/PlatformTouchEvent.h:
     15        * platform/PlatformTouchPoint.h:
     16        * platform/android/PlatformTouchEventAndroid.cpp:
     17        (WebCore::PlatformTouchEvent::PlatformTouchEvent):
     18        * platform/android/PlatformTouchPointAndroid.cpp:
     19        (WebCore::PlatformTouchPoint::PlatformTouchPoint):
     20
    1212010-09-27  Kent Tamura  <tkent@chromium.org>
    222

  • trunk/WebCore/platform/PlatformTouchEvent.h

    r68123 r68499  
    6363    PlatformTouchEvent(QTouchEvent*);
    6464#elif PLATFORM(ANDROID)
    65     PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, int metaState);
     65    PlatformTouchEvent(const Vector<IntPoint>&, TouchEventType, PlatformTouchPoint::State, int metaState);
    6666#elif PLATFORM(BREWMP)
    6767    PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);

  • trunk/WebCore/platform/PlatformTouchPoint.h

    r68123 r68499  
    4848    PlatformTouchPoint() {};
    4949#elif PLATFORM(ANDROID)
    50     PlatformTouchPoint(const IntPoint& windowPos, State);
     50    PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State);
    5151#elif PLATFORM(BREWMP)
    5252    PlatformTouchPoint(int id, const IntPoint& windowPos, State);

  • trunk/WebCore/platform/android/PlatformTouchEventAndroid.cpp

    r55843 r68499  
    3838};
    3939
    40 PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, int metaState)
     40PlatformTouchEvent::PlatformTouchEvent(const Vector<IntPoint>& windowPoints, TouchEventType type, PlatformTouchPoint::State state, int metaState)
    4141    : m_type(type)
    4242    , m_metaKey(false)
    4343{
    44     m_touchPoints.append(PlatformTouchPoint(windowPos, state));
     44    m_touchPoints.reserveCapacity(windowPoints.size());
     45    for (unsigned c = 0; c < windowPoints.size(); c++)
     46        m_touchPoints.append(PlatformTouchPoint(windowPos, state));
    4547
    4648    m_altKey = metaState & META_ALT_ON;

  • trunk/WebCore/platform/android/PlatformTouchPointAndroid.cpp

    r53994 r68499  
    3131namespace WebCore {
    3232
    33 PlatformTouchPoint::PlatformTouchPoint(const IntPoint& windowPos, State state)
    34     : m_id(0)
     33PlatformTouchPoint::PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State state)
     34    : m_id(id)
    3535    , m_state(state)
    3636    , m_screenPos(windowPos)
Note: See TracChangeset for help on using the changeset viewer.