Commit 99c730c6 authored by Tien-Ren Chen's avatar Tien-Ren Chen Committed by Commit Bot

[Blink] Fix dangling pointer to destroyed child clipping mask layer

The contents clipping mask layer on the main graphics layer needs to be
updated unconditionally because otherwise we can have dangling pointer
to a destroyed mask when both the mask and the contents layer are
destroyed at the same time.

BUG=807240

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Ica51387507232c20f1deacf9572546490f587eb9
Reviewed-on: https://chromium-review.googlesource.com/894194
Commit-Queue: Tien-Ren Chen <trchen@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533080}
parent ecc9db73
......@@ -806,10 +806,7 @@ bool CompositedLayerMapping::UpdateGraphicsLayerConfiguration(
ScrollingLayer()->SetMaskLayer(first_come_first_served);
first_come_first_served = nullptr;
}
if (is_accelerated_contents) {
graphics_layer_->SetContentsClippingMaskLayer(first_come_first_served);
first_come_first_served = nullptr;
}
graphics_layer_->SetContentsClippingMaskLayer(first_come_first_served);
}
UpdateBackgroundColor();
......
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