cc: Move solid color scrollbar layer data in a seperate struct.

cc/layers/layer_unittest.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/layers/layer.h"
 
 #include <stddef.h>
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/animation/animation_host.h"
@@ skipping 371 matching lines @@
                                          -1, false, Layer::INVALID_ID);
     deserialized_scrollbar->inputs_.layer_id =
         source_scrollbar->inputs_.layer_id;
 
     // FromLayerSpecificPropertiesProto expects a non-null LayerTreeHost to be
     // set.
     deserialized_scrollbar->SetLayerTreeHost(layer_tree_host_.get());
     deserialized_scrollbar->FromLayerSpecificPropertiesProto(
         serialized_scrollbar);
 
-    EXPECT_EQ(source_scrollbar->track_start_,
-              deserialized_scrollbar->track_start_);
-    EXPECT_EQ(source_scrollbar->thumb_thickness_,
-              deserialized_scrollbar->thumb_thickness_);
-    EXPECT_EQ(source_scrollbar->scroll_layer_id_,
-              deserialized_scrollbar->scroll_layer_id_);
-    EXPECT_EQ(source_scrollbar->is_left_side_vertical_scrollbar_,
-              deserialized_scrollbar->is_left_side_vertical_scrollbar_);
-    EXPECT_EQ(source_scrollbar->orientation_,
-              deserialized_scrollbar->orientation_);
+    EXPECT_EQ(source_scrollbar->solid_color_scrollbar_layer_inputs_.track_start,
+              deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
+                  .track_start);
+    EXPECT_EQ(
+        source_scrollbar->solid_color_scrollbar_layer_inputs_.thumb_thickness,
+        deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
+            .thumb_thickness);
+    EXPECT_EQ(
+        source_scrollbar->solid_color_scrollbar_layer_inputs_.scroll_layer_id,
+        deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
+            .scroll_layer_id);
+    EXPECT_EQ(source_scrollbar->solid_color_scrollbar_layer_inputs_
+                  .is_left_side_vertical_scrollbar,
+              deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
+                  .is_left_side_vertical_scrollbar);
+    EXPECT_EQ(source_scrollbar->solid_color_scrollbar_layer_inputs_.orientation,
+              deserialized_scrollbar->solid_color_scrollbar_layer_inputs_
+                  .orientation);
 
     deserialized_scrollbar->SetLayerTreeHost(nullptr);
   }
 
   void RunScrollAndClipLayersTest() {
     scoped_refptr<Layer> layer = Layer::Create();
 
     scoped_refptr<Layer> scroll_parent = Layer::Create();
     layer->inputs_.scroll_parent = scroll_parent.get();
     scoped_refptr<Layer> scroll_child = Layer::Create();
@@ skipping 2119 matching lines @@
   EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties());
 
   test_layer->PushPropertiesTo(impl_layer.get());
 
   EXPECT_EQ(ElementId(2, 0), impl_layer->element_id());
   EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties());
 }
 
 }  // namespace
 }  // namespace cc