Changeset 117128 in webkit


Ignore:
Timestamp:
May 15, 2012 12:58:56 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Compute the best target node on a GestureTap event
​https://bugs.webkit.org/show_bug.cgi?id=85101

Patch by Terry Anderson <​tdanderson@chromium.org> on 2012-05-15
Reviewed by Adam Barth.

Source/WebCore:

Using the tests in the touchadjustment/ directory.

  • WebCore.gypi:

Include TouchAdjustment.* files.

  • page/TouchAdjustment.cpp:

(WebCore::TouchAdjustment::zoomableIntersectionQuotient):
(WebCore::TouchAdjustment::findNodeWithLowestDistanceMetric):
No longer using the INFINITY constant due to problems with compiling
on chromium win.

Source/WebKit/chromium:

  • features.gypi:

Enable the touch adjustment code by default.

  • src/WebInputEventConversion.cpp:

(WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
In the case of a GestureTap, deltaX represents the horizontal padding of the touch
area and deltaY represents the vertical padding of the touch area.

LayoutTests:

  • platform/chromium/test_expectations.txt:

The flaky tests in touchadjustment/ have been addressed in WK86218.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r117123 r117128  
     12012-05-15  Terry Anderson  <tdanderson@chromium.org>
     2
     3        [chromium] Compute the best target node on a GestureTap event
     4        https://bugs.webkit.org/show_bug.cgi?id=85101
     5
     6        Reviewed by Adam Barth.
     7
     8        * platform/chromium/test_expectations.txt:
     9        The flaky tests in touchadjustment/ have been addressed in WK86218.
     10
    1112012-05-15  Mike West  <mkwst@chromium.org>
    212

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r117089 r117128  
    143143// Battery Status API is not supported yet in the chromium port.
    144144BUGWK62698 SKIP : batterystatus = PASS FAIL
    145 
    146 // Touch Adjustment is not supported yet in the chromium port.
    147 BUGWK78801 SKIP : touchadjustment/ = FAIL
    148145
    149146// Network Information API is not supported yet in the chromium port.

  • trunk/Source/WebCore/ChangeLog

    r117126 r117128  
     12012-05-15  Terry Anderson  <tdanderson@chromium.org>
     2
     3        [chromium] Compute the best target node on a GestureTap event
     4        https://bugs.webkit.org/show_bug.cgi?id=85101
     5
     6        Reviewed by Adam Barth.
     7
     8        Using the tests in the touchadjustment/ directory.
     9
     10        * WebCore.gypi:
     11        Include TouchAdjustment.* files.
     12        * page/TouchAdjustment.cpp:
     13        (WebCore::TouchAdjustment::zoomableIntersectionQuotient):
     14        (WebCore::TouchAdjustment::findNodeWithLowestDistanceMetric):
     15        No longer using the INFINITY constant due to problems with compiling
     16        on chromium win.
     17
    1182012-05-15  Chris Rogers  <crogers@google.com>
    219

  • trunk/Source/WebCore/WebCore.gypi

    r117126 r117128  
    30633063            'page/SuspendableTimer.cpp',
    30643064            'page/SuspendableTimer.h',
     3065            'page/TouchAdjustment.cpp',
     3066            'page/TouchAdjustment.h',
    30653067            'page/UserContentURLPattern.cpp',
    30663068            'page/WebKitAnimation.cpp',

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

    r116994 r117128  
    232232    // Check the rectangle is meaningful zoom target. It should at least contain the hotspot.
    233233    if (!rect.contains(touchHotspot))
    234         return INFINITY;
     234        return std::numeric_limits<float>::infinity();
    235235    IntRect intersection = rect;
    236236    intersection.intersect(touchArea);
    … …  
    247247{
    248248    targetNode = 0;
    249     float bestDistanceMetric = INFINITY;
     249    float bestDistanceMetric = std::numeric_limits<float>::infinity();
    250250    SubtargetGeometryList::const_iterator it = subtargets.begin();
    251251    const SubtargetGeometryList::const_iterator end = subtargets.end();

  • trunk/Source/WebKit/chromium/ChangeLog

    r117110 r117128  
     12012-05-15  Terry Anderson  <tdanderson@chromium.org>
     2
     3        [chromium] Compute the best target node on a GestureTap event
     4        https://bugs.webkit.org/show_bug.cgi?id=85101
     5
     6        Reviewed by Adam Barth.
     7
     8        * features.gypi:
     9        Enable the touch adjustment code by default.
     10        * src/WebInputEventConversion.cpp:
     11        (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
     12        In the case of a GestureTap, deltaX represents the horizontal padding of the touch
     13        area and deltaY represents the vertical padding of the touch area.
     14
    1152012-05-15  James Robinson  <jamesr@chromium.org>
    216

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

    r117028 r117128  
    9999      'ENABLE_SVG=<(enable_svg)',
    100100      'ENABLE_SVG_FONTS=<(enable_svg)',
     101      'ENABLE_TOUCH_ADJUSTMENT=1',
    101102      'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
    102103      'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',

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

    r117098 r117128  
    149149    case WebInputEvent::GestureTap:
    150150        m_type = PlatformEvent::GestureTap;
     151        m_area = IntSize(e.deltaX * 2, e.deltaY * 2);
    151152        break;
    152153    case WebInputEvent::GestureTapDown:
Note: See TracChangeset for help on using the changeset viewer.