Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / compositing / GraphicsLayerUpdater.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp b/src/third_party/WebKit/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp
index 216d772..5f8366f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp
+++ b/src/third_party/WebKit/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"
@@ -98,19 +99,11 @@ void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType update
             ASSERT(compositingContainer == layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf));
 
             if (mapping->updateRequiresOwnBackingStoreForAncestorReasons(compositingContainer)) {
+                TRACE_LAYER_INVALIDATION(&layer, InspectorLayerInvalidationTrackingEvent::AncestorRequiresNewLayer);
                 layersNeedingPaintInvalidation.append(&layer);
                 updateType = ForceUpdate;
             }
 
-            // Note carefully: here we assume that the compositing state of all descendants have been updated already,
-            // so it is legitimate to compute and cache the composited bounds for this layer.
-            mapping->updateCompositedBounds();
-
-            if (RenderLayerReflectionInfo* reflection = layer.reflectionInfo()) {
-                if (reflection->reflectionLayer()->hasCompositedLayerMapping())
-                    reflection->reflectionLayer()->compositedLayerMapping()->updateCompositedBounds();
-            }
-
             if (mapping->updateGraphicsLayerConfiguration())
                 m_needsRebuildTree = true;