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

Unified Diff: Source/core/inspector/InspectorLayerTreeAgent.cpp

Issue 26110004: Defer the real work in updateCompositingLayers until it's really needed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: inspector needs fixing, otherwise good to go Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/InspectorLayerTreeAgent.cpp
diff --git a/Source/core/inspector/InspectorLayerTreeAgent.cpp b/Source/core/inspector/InspectorLayerTreeAgent.cpp
index 2f4d146c96f58e060dcd895fef5d4020709af77c..ec299e68cb82490d9693f53ff310a896da3b8989 100644
--- a/Source/core/inspector/InspectorLayerTreeAgent.cpp
+++ b/Source/core/inspector/InspectorLayerTreeAgent.cpp
@@ -197,6 +197,10 @@ void InspectorLayerTreeAgent::getLayers(ErrorString* errorString, const int* nod
return;
}
RenderLayer* enclosingLayer = renderer->enclosingLayer();
+ if (!enclosingLayer->enclosingCompositingLayer() || !enclosingLayer->enclosingCompositingLayer()->compositedLayerMapping()) {
+ *errorString = "No CompositedLayerMapping for the provided node";
caseq 2013/10/17 12:37:38 When are we supposed to hit this? enclosingComposi
shawnsingh 2013/10/17 19:00:05 Yeah - as you suspected, this issue occurs when co
+ return;
+ }
GraphicsLayer* enclosingGraphicsLayer = enclosingLayer->enclosingCompositingLayer()->compositedLayerMapping()->childForSuperlayers();
buildLayerIdToNodeIdMap(errorString, enclosingLayer, layerIdToNodeIdMap);
gatherGraphicsLayers(enclosingGraphicsLayer, layerIdToNodeIdMap, layers);

Powered by Google App Engine
This is Rietveld 408576698