Remove redundant update of viewport layer types

cc/trees/layer_tree_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 997 matching lines @@
 void LayerTreeImpl::SetViewportLayersFromIds(
     int overscroll_elasticity_layer_id,
     int page_scale_layer_id,
     int inner_viewport_scroll_layer_id,
     int outer_viewport_scroll_layer_id) {
   overscroll_elasticity_layer_id_ = overscroll_elasticity_layer_id;
   page_scale_layer_id_ = page_scale_layer_id;
   inner_viewport_scroll_layer_id_ = inner_viewport_scroll_layer_id;
   outer_viewport_scroll_layer_id_ = outer_viewport_scroll_layer_id;
 
-  UpdateViewportLayerTypes();
-}
-
-void LayerTreeImpl::ClearViewportLayers() {
-  SetViewportLayersFromIds(Layer::INVALID_ID, Layer::INVALID_ID,
-                           Layer::INVALID_ID, Layer::INVALID_ID);
-}
-
-void LayerTreeImpl::UpdateViewportLayerTypes() {
   // The scroll_clip_layer Layer properties should be up-to-date.
-  // TODO(pdr): Enable this DCHECK by not calling this function unnecessarily
-  // from LayerImpl::SetScrollClipLayer.
-  // DCHECK(lifecycle().AllowsLayerPropertyAccess());
-
+  DCHECK(lifecycle().AllowsLayerPropertyAccess());
   if (auto* inner_scroll = LayerById(inner_viewport_scroll_layer_id_)) {
     inner_scroll->SetViewportLayerType(INNER_VIEWPORT_SCROLL);
     if (auto* inner_container = inner_scroll->scroll_clip_layer())
       inner_container->SetViewportLayerType(INNER_VIEWPORT_CONTAINER);
   }
   if (auto* outer_scroll = LayerById(outer_viewport_scroll_layer_id_)) {
     outer_scroll->SetViewportLayerType(OUTER_VIEWPORT_SCROLL);
     if (auto* outer_container = outer_scroll->scroll_clip_layer())
       outer_container->SetViewportLayerType(OUTER_VIEWPORT_CONTAINER);
   }
 }
 
+void LayerTreeImpl::ClearViewportLayers() {
+  SetViewportLayersFromIds(Layer::INVALID_ID, Layer::INVALID_ID,
+                           Layer::INVALID_ID, Layer::INVALID_ID);
+}
+
 // For unit tests, we use the layer's id as its element id.
 static void SetElementIdForTesting(LayerImpl* layer) {
   layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
 }
 
 void LayerTreeImpl::SetElementIdsForTesting() {
   LayerListIterator<LayerImpl> it(root_layer_for_testing_);
   for (; it != LayerListIterator<LayerImpl>(nullptr); ++it) {
     if (!it->element_id())
       SetElementIdForTesting(*it);
@@ skipping 1091 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc