| OLD | NEW |
| 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 1241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1252 if (targets) { | 1252 if (targets) { |
| 1253 for (const auto& target : *targets) | 1253 for (const auto& target : *targets) |
| 1254 count += target.value; | 1254 count += target.value; |
| 1255 } | 1255 } |
| 1256 return count; | 1256 return count; |
| 1257 } | 1257 } |
| 1258 | 1258 |
| 1259 unsigned Internals::wheelEventHandlerCount(Document* document) | 1259 unsigned Internals::wheelEventHandlerCount(Document* document) |
| 1260 { | 1260 { |
| 1261 ASSERT(document); | 1261 ASSERT(document); |
| 1262 return eventHandlerCount(*document, EventHandlerRegistry::WheelEvent); | 1262 return eventHandlerCount(*document, EventHandlerRegistry::WheelEventBlocking
); |
| 1263 } | 1263 } |
| 1264 | 1264 |
| 1265 unsigned Internals::scrollEventHandlerCount(Document* document) | 1265 unsigned Internals::scrollEventHandlerCount(Document* document) |
| 1266 { | 1266 { |
| 1267 ASSERT(document); | 1267 ASSERT(document); |
| 1268 return eventHandlerCount(*document, EventHandlerRegistry::ScrollEvent); | 1268 return eventHandlerCount(*document, EventHandlerRegistry::ScrollEvent); |
| 1269 } | 1269 } |
| 1270 | 1270 |
| 1271 unsigned Internals::touchEventHandlerCount(Document* document) | 1271 unsigned Internals::touchEventHandlerCount(Document* document) |
| 1272 { | 1272 { |
| 1273 ASSERT(document); | 1273 ASSERT(document); |
| 1274 return eventHandlerCount(*document, EventHandlerRegistry::TouchEvent); | 1274 return eventHandlerCount(*document, EventHandlerRegistry::TouchEventBlocking
); |
| 1275 } | 1275 } |
| 1276 | 1276 |
| 1277 static PaintLayer* findLayerForGraphicsLayer(PaintLayer* searchRoot, GraphicsLay
er* graphicsLayer, IntSize* layerOffset, String* layerType) | 1277 static PaintLayer* findLayerForGraphicsLayer(PaintLayer* searchRoot, GraphicsLay
er* graphicsLayer, IntSize* layerOffset, String* layerType) |
| 1278 { | 1278 { |
| 1279 *layerOffset = IntSize(); | 1279 *layerOffset = IntSize(); |
| 1280 if (searchRoot->hasCompositedLayerMapping() && graphicsLayer == searchRoot->
compositedLayerMapping()->mainGraphicsLayer()) { | 1280 if (searchRoot->hasCompositedLayerMapping() && graphicsLayer == searchRoot->
compositedLayerMapping()->mainGraphicsLayer()) { |
| 1281 // If the |graphicsLayer| sets the scrollingContent layer as its | 1281 // If the |graphicsLayer| sets the scrollingContent layer as its |
| 1282 // scroll parent, consider it belongs to the scrolling layer and | 1282 // scroll parent, consider it belongs to the scrolling layer and |
| 1283 // mark the layer type as "scrolling". | 1283 // mark the layer type as "scrolling". |
| 1284 if (!searchRoot->layoutObject()->hasTransformRelatedProperty() && search
Root->scrollParent() && searchRoot->parent() == searchRoot->scrollParent()) { | 1284 if (!searchRoot->layoutObject()->hasTransformRelatedProperty() && search
Root->scrollParent() && searchRoot->parent() == searchRoot->scrollParent()) { |
| (...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2560 } | 2560 } |
| 2561 | 2561 |
| 2562 int Internals::getScrollAnimationState(Node* node) const | 2562 int Internals::getScrollAnimationState(Node* node) const |
| 2563 { | 2563 { |
| 2564 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node)) | 2564 if (ScrollableArea* scrollableArea = scrollableAreaForNode(node)) |
| 2565 return static_cast<int>(scrollableArea->scrollAnimator().m_runState); | 2565 return static_cast<int>(scrollableArea->scrollAnimator().m_runState); |
| 2566 return -1; | 2566 return -1; |
| 2567 } | 2567 } |
| 2568 | 2568 |
| 2569 } // namespace blink | 2569 } // namespace blink |
| OLD | NEW |