| 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 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1241 | 1241 |
| 1242 unsigned Internals::scrollEventHandlerCount(Document* document) | 1242 unsigned Internals::scrollEventHandlerCount(Document* document) |
| 1243 { | 1243 { |
| 1244 ASSERT(document); | 1244 ASSERT(document); |
| 1245 return eventHandlerCount(*document, EventHandlerRegistry::ScrollEvent); | 1245 return eventHandlerCount(*document, EventHandlerRegistry::ScrollEvent); |
| 1246 } | 1246 } |
| 1247 | 1247 |
| 1248 unsigned Internals::touchEventHandlerCount(Document* document) | 1248 unsigned Internals::touchEventHandlerCount(Document* document) |
| 1249 { | 1249 { |
| 1250 ASSERT(document); | 1250 ASSERT(document); |
| 1251 return eventHandlerCount(*document, EventHandlerRegistry::TouchEvent); | 1251 return eventHandlerCount(*document, EventHandlerRegistry::TouchEvent) + even
tHandlerCount(*document, EventHandlerRegistry::TouchMoveEvent); |
| 1252 } | 1252 } |
| 1253 | 1253 |
| 1254 static DeprecatedPaintLayer* findLayerForGraphicsLayer(DeprecatedPaintLayer* sea
rchRoot, GraphicsLayer* graphicsLayer, IntSize* layerOffset, String* layerType) | 1254 static DeprecatedPaintLayer* findLayerForGraphicsLayer(DeprecatedPaintLayer* sea
rchRoot, GraphicsLayer* graphicsLayer, IntSize* layerOffset, String* layerType) |
| 1255 { | 1255 { |
| 1256 *layerOffset = IntSize(); | 1256 *layerOffset = IntSize(); |
| 1257 if (searchRoot->hasCompositedDeprecatedPaintLayerMapping() && graphicsLayer
== searchRoot->compositedDeprecatedPaintLayerMapping()->mainGraphicsLayer()) { | 1257 if (searchRoot->hasCompositedDeprecatedPaintLayerMapping() && graphicsLayer
== searchRoot->compositedDeprecatedPaintLayerMapping()->mainGraphicsLayer()) { |
| 1258 // If the |graphicsLayer| sets the scrollingContent layer as its | 1258 // If the |graphicsLayer| sets the scrollingContent layer as its |
| 1259 // scroll parent, consider it belongs to the scrolling layer and | 1259 // scroll parent, consider it belongs to the scrolling layer and |
| 1260 // mark the layer type as "scrolling". | 1260 // mark the layer type as "scrolling". |
| 1261 if (!searchRoot->layoutObject()->hasTransformRelatedProperty() && search
Root->scrollParent() && searchRoot->parent() == searchRoot->scrollParent()) { | 1261 if (!searchRoot->layoutObject()->hasTransformRelatedProperty() && search
Root->scrollParent() && searchRoot->parent() == searchRoot->scrollParent()) { |
| (...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2480 | 2480 |
| 2481 return animator->setScrollbarsVisibleForTesting(visible); | 2481 return animator->setScrollbarsVisibleForTesting(visible); |
| 2482 } | 2482 } |
| 2483 | 2483 |
| 2484 void Internals::forceRestrictIFramePermissions() | 2484 void Internals::forceRestrictIFramePermissions() |
| 2485 { | 2485 { |
| 2486 RuntimeEnabledFeatures::setRestrictIFramePermissionsEnabled(true); | 2486 RuntimeEnabledFeatures::setRestrictIFramePermissionsEnabled(true); |
| 2487 } | 2487 } |
| 2488 | 2488 |
| 2489 } // namespace blink | 2489 } // namespace blink |
| OLD | NEW |