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

cc/layers/picture_layer_unittest.cc

 // Copyright 2013 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/picture_layer.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 44 matching lines @@
     last_updated_invalidation_ = invalidation;
   }
 
   void set_update_source_frame_number(int number) {
     update_source_frame_number_ = number;
   }
 
   void set_is_mask(bool is_mask) { is_mask_ = is_mask; }
 
   void set_nearest_neighbor(bool nearest_neighbor) {
-    inputs_.nearest_neighbor = nearest_neighbor;
+    picture_layer_inputs_.nearest_neighbor = nearest_neighbor;
   }
 
   void ValidateSerialization(
       ImageSerializationProcessor* image_serialization_processor,
       LayerTreeHost* host) {
     std::vector<uint32_t> engine_picture_ids = GetPictureIds();
     proto::LayerProperties proto;
     LayerSpecificPropertiesToProto(&proto);
 
     FakeEnginePictureCache* engine_picture_cache =
@@ skipping 11 matching lines @@
     FakeClientPictureCache* client_picture_cache =
         static_cast<FakeClientPictureCache*>(host->client_picture_cache());
     EXPECT_THAT(engine_picture_ids,
                 testing::UnorderedElementsAreArray(
                     client_picture_cache->GetAllUsedPictureIds()));
 
     // Validate that the PictureLayer specific fields are properly set.
     EXPECT_TRUE(recording_source()->EqualsTo(*layer->recording_source()));
     EXPECT_EQ(update_source_frame_number_, layer->update_source_frame_number_);
     EXPECT_EQ(is_mask_, layer->is_mask_);
-    EXPECT_EQ(inputs_.nearest_neighbor, layer->inputs_.nearest_neighbor);
+    EXPECT_EQ(picture_layer_inputs_.nearest_neighbor,
+              layer->picture_layer_inputs_.nearest_neighbor);
   }
 
   std::vector<uint32_t> GetPictureIds() {
     std::vector<uint32_t> ids;
     const DisplayItemList* display_list =
         recording_source()->GetDisplayItemList();
     if (!display_list)
       return ids;
 
     for (auto it = display_list->begin(); it != display_list->end(); ++it) {
@@ skipping 418 matching lines @@
   // Do a main frame, record the picture layers. The frame number has changed
   // non-monotonically.
   layer->SetNeedsDisplay();
   host2->Composite(base::TimeTicks::Now());
   EXPECT_EQ(3, layer->update_count());
   EXPECT_EQ(1, host2->source_frame_number());
 }
 
 }  // namespace
 }  // namespace cc