Chromium Code Reviews| Index: Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
| diff --git a/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp b/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
| index 1b1608f664eb69c733890e0053f5c77d68bfeac5..a4cdd91a174f309ca7ed74d2a40f746e05d1c39e 100644 |
| --- a/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
| +++ b/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
| @@ -28,6 +28,7 @@ |
| #include "core/rendering/compositing/GraphicsLayerUpdater.h" |
| #include "core/html/HTMLMediaElement.h" |
| +#include "core/inspector/InspectorTraceEvents.h" |
| #include "core/rendering/RenderLayer.h" |
| #include "core/rendering/RenderLayerReflectionInfo.h" |
| #include "core/rendering/RenderPart.h" |
| @@ -81,14 +82,14 @@ GraphicsLayerUpdater::~GraphicsLayerUpdater() |
| { |
| } |
| -void GraphicsLayerUpdater::update(RenderLayer& layer, Vector<RenderLayer*>& layersNeedingPaintInvalidation) |
| +void GraphicsLayerUpdater::update(RenderLayer& layer, LayersNeedingPaintInvalidation& layersNeedingPaintInvalidation) |
| { |
| TRACE_EVENT0("blink", "GraphicsLayerUpdater::update"); |
| updateRecursive(layer, DoNotForceUpdate, UpdateContext(), layersNeedingPaintInvalidation); |
| layer.compositor()->updateRootLayerPosition(); |
| } |
| -void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType updateType, const UpdateContext& context, Vector<RenderLayer*>& layersNeedingPaintInvalidation) |
| +void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType updateType, const UpdateContext& context, LayersNeedingPaintInvalidation& layersNeedingPaintInvalidation) |
| { |
| if (layer.hasCompositedLayerMapping()) { |
| CompositedLayerMapping* mapping = layer.compositedLayerMapping(); |
| @@ -98,7 +99,7 @@ void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType update |
| ASSERT(compositingContainer == layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf)); |
| if (mapping->updateRequiresOwnBackingStoreForAncestorReasons(compositingContainer)) { |
| - layersNeedingPaintInvalidation.append(&layer); |
| + layersNeedingPaintInvalidation.append(std::make_pair(&layer, InspectorLayerInvalidationTrackingEvent::AncestorRequiresNewLayer)); |
|
pdr.
2014/09/12 04:07:17
Why do we need to track the {layer,reason} pair to
kouhei (in TOK)
2014/09/12 05:02:12
The string is put into vector to avoid code duplic
|
| updateType = ForceUpdate; |
| } |