Commit 4ab01269 authored by Yoav Weiss's avatar Yoav Weiss Committed by Commit Bot

Null checks for PaintLayer::Compositor()

Change-Id: I16a94ad8e0d8ad95fa524c57b87cb2063d1c5a71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1643174Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Commit-Queue: Yoav Weiss <yoavweiss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666023}
parent 9eed5161
......@@ -1642,11 +1642,15 @@ bool PaintLayer::RequiresScrollableArea() const {
void PaintLayer::UpdateScrollableArea() {
if (RequiresScrollableArea() && !scrollable_area_) {
scrollable_area_ = PaintLayerScrollableArea::Create(*this);
Compositor()->SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree);
if (Compositor()) {
Compositor()->SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree);
}
} else if (!RequiresScrollableArea() && scrollable_area_) {
scrollable_area_->Dispose();
scrollable_area_.Clear();
Compositor()->SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree);
if (Compositor()) {
Compositor()->SetNeedsCompositingUpdate(kCompositingUpdateRebuildTree);
}
}
}
......@@ -2820,8 +2824,11 @@ void PaintLayer::ClearCompositedLayerMapping(bool layer_being_destroyed) {
// work with CompositeAfterPaint. Some transform tree changes may still
// produce incorrect behavior from JankTracker (see discussion on review
// thread of http://crrev.com/c/1636403).
Compositor()->ForceRecomputeVisualRectsIncludingNonCompositingDescendants(
layout_object_);
if (Compositor()) {
Compositor()
->ForceRecomputeVisualRectsIncludingNonCompositingDescendants(
layout_object_);
}
}
} else {
// We need to make sure our decendants get a geometry update. In principle,
......
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