| Index: LayoutTests/fast/events/hit-test-counts.html
|
| diff --git a/LayoutTests/fast/events/hit-test-counts.html b/LayoutTests/fast/events/hit-test-counts.html
|
| index 5de7f6f67440c4cab3a4bdc1ed77430ca1d923e8..cfef9cf58136aab4bdc53b2c9fd47f0be9a6635e 100644
|
| --- a/LayoutTests/fast/events/hit-test-counts.html
|
| +++ b/LayoutTests/fast/events/hit-test-counts.html
|
| @@ -26,7 +26,6 @@ html {
|
| </div>
|
| <script src="../../resources/js-test.js"></script>
|
| <script>
|
| -setPrintTestResultsLazily();
|
| if (window.internals) {
|
| window.internals.settings.setViewportEnabled(true);
|
| window.internals.settings.setMockScrollbarsEnabled(true);
|
| @@ -44,27 +43,14 @@ function hitTestCountDelta(doc)
|
| return newCount - lastCount;
|
| }
|
|
|
| -function hitTestCacheHitsDelta(doc)
|
| -{
|
| - var lastCount = 0;
|
| - if ('lastHitTestCacheHits' in doc)
|
| - lastCount = doc.lastHitTestCacheHits;
|
| - var newCount = internals.hitTestCacheHits(doc);
|
| - doc.lastHitTestCacheHits = newCount;
|
| - return newCount - lastCount;
|
| -}
|
| -
|
| function logCounts(label, documents, multiTapNotification, eventSenderFunction)
|
| {
|
| if (eventSenderFunction)
|
| eventSenderFunction();
|
|
|
| var countStr = '';
|
| - for(var i = 0; i < documents.length; i++) {
|
| - var hits = hitTestCountDelta(documents[i]);
|
| - var cacheHits = hitTestCacheHitsDelta(documents[i]);
|
| - countStr += ' ' + (hits - cacheHits) + "+" + cacheHits;
|
| - }
|
| + for(var i = 0; i < documents.length; i++)
|
| + countStr += ' ' + hitTestCountDelta(documents[i]);
|
|
|
| if (multiTapNotification) {
|
| debug(label + ':' + eventCounts[label]
|
| @@ -78,10 +64,8 @@ function logCounts(label, documents, multiTapNotification, eventSenderFunction)
|
|
|
| function clearCounts(documents)
|
| {
|
| - for(var i = 0; i < documents.length; i++) {
|
| + for(var i = 0; i < documents.length; i++)
|
| documents[i].lastHitTestCount = internals.hitTestCount(documents[i]);
|
| - documents[i].lastHitTestCacheHits = internals.hitTestCacheHits(documents[i]);
|
| - }
|
| }
|
|
|
| function sendEvents(targetX, targetY, documents, multiTapNotification)
|
| @@ -153,9 +137,6 @@ function runTestForDocuments(targetX, targetY, documents)
|
| {
|
| sendEvents(targetX, targetY, documents, false);
|
| window.internals.settings.setMultiTargetTapNotificationEnabled(true);
|
| - for(var i = 0; i < documents.length; i++) {
|
| - internals.clearHitTestCache(documents[i]);
|
| - }
|
| sendEvents(targetX, targetY, documents, true);
|
| window.internals.settings.setMultiTargetTapNotificationEnabled(false);
|
| }
|
| @@ -200,6 +181,5 @@ onload = function() {
|
| runTestForDocuments(point.x, point.y, [document]);
|
| debug('');
|
| window.internals.settings.setViewportEnabled(true);
|
| - finishJSTest();
|
| }
|
| </script>
|
|
|