Commit 07ea0fed authored by Stefan Zager's avatar Stefan Zager Committed by Commit Bot

Check for null iframe root layer in GraphicsLayerTreeBuilder

It's not clear why InCompositingMode() would be out of sync with
the allocation of the root graphics layer, even when the iframe is
throttled; but the CHECK was being hit.

BUG=1092673

Change-Id: I709f0958db7fb9e2c8fb315abac01c56aa0bded0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2274674Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Stefan Zager <szager@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784086}
parent 4fdc0622
...@@ -128,10 +128,10 @@ void GraphicsLayerTreeBuilder::RebuildRecursive( ...@@ -128,10 +128,10 @@ void GraphicsLayerTreeBuilder::RebuildRecursive(
// state. // state.
DisableCompositingQueryAsserts disabler; DisableCompositingQueryAsserts disabler;
if (inner_compositor->InCompositingMode()) { if (inner_compositor->InCompositingMode()) {
GraphicsLayer* inner_root_layer = inner_compositor->RootGraphicsLayer(); if (GraphicsLayer* inner_root_layer =
// TODO(szager): Change to DCHECK after diagnosing crbug.com/1092673 inner_compositor->RootGraphicsLayer()) {
CHECK(inner_root_layer); layer_vector_for_children->push_back(inner_root_layer);
layer_vector_for_children->push_back(inner_root_layer); }
} }
inner_compositor->ClearRootLayerAttachmentDirty(); inner_compositor->ClearRootLayerAttachmentDirty();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment