cc : Move LayerImpl::parent to test properties

cc/layers/layer_impl.cc

 // Copyright 2012 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/layers/layer_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 26 matching lines @@
 #include "cc/trees/proxy.h"
 #include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 
 namespace cc {
 LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
-    : parent_(nullptr),
-      mask_layer_id_(-1),
+    : mask_layer_id_(-1),
       mask_layer_(nullptr),
       replica_layer_id_(-1),
       replica_layer_(nullptr),
       layer_id_(id),
       layer_tree_impl_(tree_impl),
       test_properties_(nullptr),
       scroll_clip_layer_id_(Layer::INVALID_ID),
       main_thread_scrolling_reasons_(
           MainThreadScrollingReason::kNotScrollingOnMain),
       user_scrollable_horizontal_(true),
@@ skipping 46 matching lines @@
       TRACE_DISABLED_BY_DEFAULT("cc.debug"), "cc::LayerImpl", this);
 
   // The mask and replica layers should have been removed already.
   if (mask_layer_)
     DCHECK(!layer_tree_impl_->RemoveLayer(mask_layer_id_));
   if (replica_layer_)
     DCHECK(!layer_tree_impl_->RemoveLayer(replica_layer_id_));
 }
 
 void LayerImpl::AddChild(std::unique_ptr<LayerImpl> child) {
-  child->SetParent(this);
+  child->test_properties()->parent = this;
   DCHECK_EQ(layer_tree_impl(), child->layer_tree_impl());
   test_properties()->children.push_back(child.get());
   layer_tree_impl_->AddLayer(std::move(child));
 }
 
 std::unique_ptr<LayerImpl> LayerImpl::RemoveChildForTesting(LayerImpl* child) {
   auto it = std::find(test_properties()->children.begin(),
                       test_properties()->children.end(), child);
   if (it != test_properties()->children.end())
     test_properties()->children.erase(it);
   layer_tree_impl()->property_trees()->RemoveIdFromIdToIndexMaps(child->id());
   return layer_tree_impl_->RemoveLayer(child->id());
 }
 
-void LayerImpl::SetParent(LayerImpl* parent) {
-  parent_ = parent;
-}
-
 void LayerImpl::ClearLinksToOtherLayers() {
   mask_layer_ = nullptr;
   replica_layer_ = nullptr;
 }
 
 void LayerImpl::SetHasWillChangeTransformHint(bool has_will_change) {
   if (has_will_change_transform_hint_ == has_will_change)
     return;
   has_will_change_transform_hint_ = has_will_change;
   SetNeedsPushProperties();
@@ skipping 1212 matching lines @@
            .layer_transforms_should_scale_layer_contents) {
     return default_scale;
   }
 
   gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents(
       ScreenSpaceTransform(), default_scale);
   return std::max(transform_scales.x(), transform_scales.y());
 }
 
 }  // namespace cc