cc: Turn impl_side_painting and use_one_copy on in LayerTreeSettings.

cc/layers/tiled_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/tiled_layer.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 59 matching lines @@
         queue_(make_scoped_ptr(new ResourceUpdateQueue)),
         impl_thread_("ImplThread") {
     settings_.max_partial_texture_updates = std::numeric_limits<size_t>::max();
     settings_.layer_transforms_should_scale_layer_contents = true;
     settings_.impl_side_painting = false;
     settings_.verify_property_trees = false;
   }
 
   void SetUp() override {
     impl_thread_.Start();
-    shared_bitmap_manager_.reset(new TestSharedBitmapManager());
     LayerTreeHost::InitParams params;
     params.client = &synchronous_output_surface_client_;
-    params.shared_bitmap_manager = shared_bitmap_manager_.get();
+    params.shared_bitmap_manager = &shared_bitmap_manager_;
     params.settings = &settings_;
     params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
 
     layer_tree_host_ =
         LayerTreeHost::CreateThreaded(impl_thread_.task_runner(), &params);
     synchronous_output_surface_client_.SetLayerTreeHost(layer_tree_host_.get());
     proxy_ = layer_tree_host_->proxy();
     resource_manager_ = PrioritizedResourceManager::Create(proxy_);
     layer_tree_host_->SetLayerTreeHostClientReady();
     CHECK(synchronous_output_surface_client_.EnsureOutputSurfaceCreated());
 
     layer_tree_host_->SetRootLayer(Layer::Create(layer_settings_));
 
     CHECK(output_surface_->BindToClient(&output_surface_client_));
 
     DebugScopedSetImplThreadAndMainThreadBlocked
         impl_thread_and_main_thread_blocked(proxy_);
-    resource_provider_ = FakeResourceProvider::Create(
-        output_surface_.get(), shared_bitmap_manager_.get());
+    resource_provider_ = FakeResourceProvider::Create(output_surface_.get(),
+                                                      &shared_bitmap_manager_);
     host_impl_ = make_scoped_ptr(new FakeLayerTreeHostImpl(
-        proxy_, shared_bitmap_manager_.get(), nullptr));
+        settings_, proxy_, &shared_bitmap_manager_, nullptr));
   }
 
   ~TiledLayerTest() override {
     ResourceManagerClearAllMemory(resource_manager_.get(),
                                   resource_provider_.get());
 
     DebugScopedSetImplThreadAndMainThreadBlocked
     impl_thread_and_main_thread_blocked(proxy_);
     resource_provider_ = nullptr;
     host_impl_ = nullptr;
@@ skipping 95 matching lines @@
       LayerPushPropertiesTo(layer2.get(), layer_impl2.get());
 
     return needs_update;
   }
 
  public:
   Proxy* proxy_;
   LayerTreeSettings settings_;
   LayerSettings layer_settings_;
   FakeOutputSurfaceClient output_surface_client_;
+  TestSharedBitmapManager shared_bitmap_manager_;
   scoped_ptr<OutputSurface> output_surface_;
-  scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<ResourceUpdateQueue> queue_;
   PriorityCalculator priority_calculator_;
   base::Thread impl_thread_;
   SynchronousOutputSurfaceClient synchronous_output_surface_client_;
   scoped_ptr<LayerTreeHost> layer_tree_host_;
   scoped_ptr<FakeLayerTreeHostImpl> host_impl_;
   scoped_ptr<PrioritizedResourceManager> resource_manager_;
 };
 
@@ skipping 1175 matching lines @@
 
   // Rounding leads to an extra pixel.
   gfx::Rect expanded_layer_rect(layer_rect);
   expanded_layer_rect.set_height(32);
   EXPECT_EQ(expanded_layer_rect,
             layer->tracking_layer_painter()->PaintedRect());
 }
 
 }  // namespace
 }  // namespace cc