Changeset 113193 in webkit
- Timestamp:
- Apr 4, 2012 8:42:02 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r113188 r113193 1 2012-04-04 Allan Sandfeld Jensen <allan.jensen@nokia.com> 2 3 Best clickable node might return non "clickable" node. 4 https://bugs.webkit.org/show_bug.cgi?id=83153 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 * touchadjustment/touch-inlines-expected.txt: 9 * touchadjustment/touch-inlines.html: 10 1 11 2012-04-04 Csaba Osztrogonác <ossy@webkit.org> 2 12 -
trunk/LayoutTests/touchadjustment/touch-inlines-expected.txt
r111185 r113193 16 16 PASS adjustedNode.id is "6" 17 17 Test a few direct misses. 18 PASS adjustedNode .id is ""19 PASS adjustedNode .id is ""18 PASS adjustedNode is null 19 PASS adjustedNode is null 20 20 Test some in-direct hits. 21 21 PASS adjustedNode.id is "2" -
trunk/LayoutTests/touchadjustment/touch-inlines.html
r111185 r113193 27 27 var height = radius * 2; 28 28 var adjustedNode = internals.touchNodeAdjustedToBestClickableNode(x, y, width, height, document); 29 if (adjustedNode .nodeType == 3) // TEXT node29 if (adjustedNode && adjustedNode.nodeType == 3) // TEXT node 30 30 adjustedNode = adjustedNode.parentNode; 31 31 return adjustedNode; … … 54 54 55 55 adjustedNode = testRoundTouch(56, 60, 8) 56 should BeEqualToString('adjustedNode.id', '');56 shouldEvaluateTo('adjustedNode', 'null'); 57 57 58 58 adjustedNode = testRoundTouch(20, 160, 4) 59 should BeEqualToString('adjustedNode.id', '');59 shouldEvaluateTo('adjustedNode', 'null'); 60 60 61 61 } -
trunk/Source/WebCore/ChangeLog
r113192 r113193 1 2012-04-04 Allan Sandfeld Jensen <allan.jensen@nokia.com> 2 3 Best clickable node might return non "clickable" node. 4 https://bugs.webkit.org/show_bug.cgi?id=83153 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Do not return non-clickable nodes as a best clickable node. 9 10 * page/EventHandler.cpp: 11 (WebCore::EventHandler::bestClickableNodeForTouchPoint): 12 1 13 2012-04-04 Pavel Feldman <pfeldman@chromium.org> 2 14 -
trunk/Source/WebCore/page/EventHandler.cpp
r112669 r113193 2470 2470 IntRect touchRect = result.rectForPoint(touchCenter); 2471 2471 RefPtr<StaticHashSetNodeList> nodeList = StaticHashSetNodeList::adopt(result.rectBasedTestResult()); 2472 if (!findBestClickableCandidate(targetNode, targetPoint, touchCenter, touchRect, *nodeList.get())) { 2473 // Default to just returning innerNonSharedNode. 2474 targetPoint = touchCenter; 2475 targetNode = result.innerNonSharedNode(); 2476 } 2472 findBestClickableCandidate(targetNode, targetPoint, touchCenter, touchRect, *nodeList.get()); 2477 2473 } 2478 2474
Note: See TracChangeset
for help on using the changeset viewer.