| Index: cc/trees/layer_tree_host_common.cc
|
| diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
|
| index 2335f4e0315b29726af6279526ed3c26955ca29f..cd3735a87cb69da3556c201d5c920733f8d4aa3a 100644
|
| --- a/cc/trees/layer_tree_host_common.cc
|
| +++ b/cc/trees/layer_tree_host_common.cc
|
| @@ -327,16 +327,16 @@ template <typename LayerType> static inline bool IsRootLayer(LayerType* layer) {
|
|
|
| template <typename LayerType>
|
| static inline bool LayerIsInExisting3DRenderingContext(LayerType* layer) {
|
| - return layer->is_3d_sorted() && layer->parent() &&
|
| - layer->parent()->is_3d_sorted();
|
| + return layer->Is3dSorted() && layer->parent() &&
|
| + layer->parent()->Is3dSorted();
|
| }
|
|
|
| template <typename LayerType>
|
| static bool IsRootLayerOfNewRenderingContext(LayerType* layer) {
|
| if (layer->parent())
|
| - return !layer->parent()->is_3d_sorted() && layer->is_3d_sorted();
|
| + return !layer->parent()->Is3dSorted() && layer->Is3dSorted();
|
|
|
| - return layer->is_3d_sorted();
|
| + return layer->Is3dSorted();
|
| }
|
|
|
| template <typename LayerType>
|
| @@ -2287,7 +2287,7 @@ static void CalculateDrawPropertiesInternal(
|
| // drawn from back to front. If the preserves-3d property is also set on the
|
| // parent then skip the sorting as the parent will sort all the descendants
|
| // anyway.
|
| - if (globals.layer_sorter && descendants.size() && layer->is_3d_sorted() &&
|
| + if (globals.layer_sorter && descendants.size() && layer->Is3dSorted() &&
|
| !LayerIsInExisting3DRenderingContext(layer)) {
|
| SortLayers(descendants.begin() + sorting_start_index,
|
| descendants.end(),
|
|
|