Commit 66ff1d47 authored by Xianzhu Wang's avatar Xianzhu Wang Committed by Commit Bot

Make showLayerTree(PaintLayer) work in CompositeAfterPaint

Previously DisableCompositingQueryAsserts triggered DCHECK failure in
CompositeAfterPaint.

Change-Id: I9f341a7fb176d357aa325f2cde9c497cf4536fbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2261176
Auto-Submit: Xianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781490}
parent 4bed7a22
...@@ -3514,12 +3514,15 @@ DisableCompositingQueryAsserts::DisableCompositingQueryAsserts() ...@@ -3514,12 +3514,15 @@ DisableCompositingQueryAsserts::DisableCompositingQueryAsserts()
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
void showLayerTree(const blink::PaintLayer* layer) { void showLayerTree(const blink::PaintLayer* layer) {
blink::DisableCompositingQueryAsserts disabler;
if (!layer) { if (!layer) {
LOG(ERROR) << "Cannot showLayerTree. Root is (nil)"; LOG(ERROR) << "Cannot showLayerTree. Root is (nil)";
return; return;
} }
base::Optional<blink::DisableCompositingQueryAsserts> disabler;
if (!blink::RuntimeEnabledFeatures::CompositeAfterPaintEnabled())
disabler.emplace();
if (blink::LocalFrame* frame = layer->GetLayoutObject().GetFrame()) { if (blink::LocalFrame* frame = layer->GetLayoutObject().GetFrame()) {
WTF::String output = WTF::String output =
ExternalRepresentation(frame, ExternalRepresentation(frame,
......
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