Commit fdaf667d authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

blink: remove unnecessary root-layer checks

The root layer is always a scroll container, so checking for
root-layer in addition to scroll container is unnecessary.

BUG=1087667

Change-Id: I179f9f5aaa9e65481e753067db46c98a756d8a67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2432412
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811826}
parent c7db0309
...@@ -95,7 +95,7 @@ void CompositingInputsUpdater::ApplyAncestorInfoToSelfAndAncestorsRecursively( ...@@ -95,7 +95,7 @@ void CompositingInputsUpdater::ApplyAncestorInfoToSelfAndAncestorsRecursively(
geometry_map_->PushMappingsToAncestor(layer, layer->Parent()); geometry_map_->PushMappingsToAncestor(layer, layer->Parent());
UpdateAncestorInfo(layer, update_type, info); UpdateAncestorInfo(layer, update_type, info);
if (layer != compositing_inputs_root_ && if (layer != compositing_inputs_root_ &&
(layer->IsRootLayer() || layer->GetLayoutObject().IsScrollContainer())) layer->GetLayoutObject().IsScrollContainer())
info.last_scroll_container_layer = layer; info.last_scroll_container_layer = layer;
} }
...@@ -151,7 +151,7 @@ void CompositingInputsUpdater::UpdateSelfAndDescendantsRecursively( ...@@ -151,7 +151,7 @@ void CompositingInputsUpdater::UpdateSelfAndDescendantsRecursively(
geometry_map_->PushMappingsToAncestor(layer, layer->Parent()); geometry_map_->PushMappingsToAncestor(layer, layer->Parent());
UpdateAncestorInfo(layer, update_type, info); UpdateAncestorInfo(layer, update_type, info);
} }
if (layer->IsRootLayer() || layout_object.IsScrollContainer()) if (layout_object.IsScrollContainer())
info.last_scroll_container_layer = layer; info.last_scroll_container_layer = layer;
PaintLayerCompositor* compositor = PaintLayerCompositor* compositor =
......
...@@ -386,7 +386,7 @@ void PrePaintTreeWalk::UpdateAuxiliaryObjectProperties( ...@@ -386,7 +386,7 @@ void PrePaintTreeWalk::UpdateAuxiliaryObjectProperties(
// update layer position and ancestor inputs updates in the same walk). // update layer position and ancestor inputs updates in the same walk).
paint_layer->UpdateLayerPosition(); paint_layer->UpdateLayerPosition();
} }
if (paint_layer->IsRootLayer() || object.IsScrollContainer()) if (object.IsScrollContainer())
context.ancestor_scroll_container_paint_layer = paint_layer; context.ancestor_scroll_container_paint_layer = paint_layer;
} }
......
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