Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: third_party/WebKit/Source/core/testing/Internals.cpp

Issue 1895303007: Non passive touch end or touch cancel listeners should not block scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 ASSERT(document); 1264 ASSERT(document);
1265 return eventHandlerCount(*document, EventHandlerRegistry::WheelEventBlocking ); 1265 return eventHandlerCount(*document, EventHandlerRegistry::WheelEventBlocking );
1266 } 1266 }
1267 1267
1268 unsigned Internals::scrollEventHandlerCount(Document* document) 1268 unsigned Internals::scrollEventHandlerCount(Document* document)
1269 { 1269 {
1270 ASSERT(document); 1270 ASSERT(document);
1271 return eventHandlerCount(*document, EventHandlerRegistry::ScrollEvent); 1271 return eventHandlerCount(*document, EventHandlerRegistry::ScrollEvent);
1272 } 1272 }
1273 1273
1274 unsigned Internals::touchEventHandlerCount(Document* document) 1274 unsigned Internals::touchStartOrMoveEventHandlerCount(Document* document)
1275 { 1275 {
1276 ASSERT(document); 1276 ASSERT(document);
1277 return eventHandlerCount(*document, EventHandlerRegistry::TouchEventBlocking ); 1277 return eventHandlerCount(*document, EventHandlerRegistry::TouchStartOrMoveEv entBlocking) + eventHandlerCount(*document, EventHandlerRegistry::TouchStartOrMo veEventPassive);
1278 }
1279
1280 unsigned Internals::touchEndOrCancelEventHandlerCount(Document* document)
1281 {
1282 ASSERT(document);
1283 return eventHandlerCount(*document, EventHandlerRegistry::TouchEndOrCancelEv entBlocking) + eventHandlerCount(*document, EventHandlerRegistry::TouchEndOrCanc elEventPassive);
1278 } 1284 }
1279 1285
1280 static PaintLayer* findLayerForGraphicsLayer(PaintLayer* searchRoot, GraphicsLay er* graphicsLayer, IntSize* layerOffset, String* layerType) 1286 static PaintLayer* findLayerForGraphicsLayer(PaintLayer* searchRoot, GraphicsLay er* graphicsLayer, IntSize* layerOffset, String* layerType)
1281 { 1287 {
1282 *layerOffset = IntSize(); 1288 *layerOffset = IntSize();
1283 if (searchRoot->hasCompositedLayerMapping() && graphicsLayer == searchRoot-> compositedLayerMapping()->mainGraphicsLayer()) { 1289 if (searchRoot->hasCompositedLayerMapping() && graphicsLayer == searchRoot-> compositedLayerMapping()->mainGraphicsLayer()) {
1284 // If the |graphicsLayer| sets the scrollingContent layer as its 1290 // If the |graphicsLayer| sets the scrollingContent layer as its
1285 // scroll parent, consider it belongs to the scrolling layer and 1291 // scroll parent, consider it belongs to the scrolling layer and
1286 // mark the layer type as "scrolling". 1292 // mark the layer type as "scrolling".
1287 if (!searchRoot->layoutObject()->hasTransformRelatedProperty() && search Root->scrollParent() && searchRoot->parent() == searchRoot->scrollParent()) { 1293 if (!searchRoot->layoutObject()->hasTransformRelatedProperty() && search Root->scrollParent() && searchRoot->parent() == searchRoot->scrollParent()) {
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
2581 } 2587 }
2582 2588
2583 String Internals::getProgrammaticScrollAnimationState(Node* node) const 2589 String Internals::getProgrammaticScrollAnimationState(Node* node) const
2584 { 2590 {
2585 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node)) 2591 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node))
2586 return scrollableArea->programmaticScrollAnimator().runStateAsText(); 2592 return scrollableArea->programmaticScrollAnimator().runStateAsText();
2587 return String(); 2593 return String();
2588 } 2594 }
2589 2595
2590 } // namespace blink 2596 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/testing/Internals.h ('k') | third_party/WebKit/Source/core/testing/Internals.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698