Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

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"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/test/fake_client_picture_cache.h"
 #include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/fake_engine_picture_cache.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_picture_layer_impl.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/layer_tree_settings_for_testing.h"
 #include "cc/test/skia_common.h"
 #include "cc/test/stub_layer_tree_host_single_thread_client.h"
-#include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace cc {
 
 class TestSerializationPictureLayer : public PictureLayer {
  public:
@@ skipping 204 matching lines @@
   host->CommitComplete();
   EXPECT_EQ(1, host->SourceFrameNumber());
 
   layer->SetBounds(gfx::Size(0, 0));
   layer->SavePaintProperties();
   // Intentionally skipping Update since it would normally be skipped on
   // a layer with empty bounds.
 
   FakeImplTaskRunnerProvider impl_task_runner_provider;
 
-  TestSharedBitmapManager shared_bitmap_manager;
   std::unique_ptr<FakeCompositorFrameSink> compositor_frame_sink =
       FakeCompositorFrameSink::CreateSoftware();
-  FakeLayerTreeHostImpl host_impl(LayerTreeSettings(),
-                                  &impl_task_runner_provider,
-                                  &shared_bitmap_manager, &task_graph_runner);
+  FakeLayerTreeHostImpl host_impl(
+      LayerTreeSettings(), &impl_task_runner_provider, &task_graph_runner);
   host_impl.InitializeRenderer(compositor_frame_sink.get());
   host_impl.CreatePendingTree();
   std::unique_ptr<FakePictureLayerImpl> layer_impl =
       FakePictureLayerImpl::Create(host_impl.pending_tree(), 1);
 
   layer->PushPropertiesTo(layer_impl.get());
   EXPECT_FALSE(layer_impl->CanHaveTilings());
   EXPECT_TRUE(layer_impl->bounds() == gfx::Size(0, 0));
   EXPECT_EQ(gfx::Size(), layer_impl->raster_source()->GetSize());
   EXPECT_FALSE(layer_impl->raster_source()->HasRecordings());
@@ skipping 15 matching lines @@
   layer->SavePaintProperties();
 
   gfx::Rect invalidation_bounds(layer_size);
 
   // The important two lines are the following:
   layer->SetNeedsDisplayRect(invalidation_bounds);
   layer->Update();
 
   host->CommitComplete();
   FakeImplTaskRunnerProvider impl_task_runner_provider;
-  TestSharedBitmapManager shared_bitmap_manager;
   std::unique_ptr<CompositorFrameSink> compositor_frame_sink(
       FakeCompositorFrameSink::Create3d());
   LayerTreeSettings layer_tree_settings = LayerTreeSettingsForTesting();
   layer_tree_settings.image_decode_tasks_enabled = true;
-  FakeLayerTreeHostImpl host_impl(layer_tree_settings,
-                                  &impl_task_runner_provider,
-                                  &shared_bitmap_manager, &task_graph_runner);
+  FakeLayerTreeHostImpl host_impl(
+      layer_tree_settings, &impl_task_runner_provider, &task_graph_runner);
   host_impl.SetVisible(true);
   host_impl.InitializeRenderer(compositor_frame_sink.get());
   host_impl.CreatePendingTree();
   host_impl.pending_tree()->SetRootLayerForTesting(
       FakePictureLayerImpl::Create(host_impl.pending_tree(), 1));
   host_impl.pending_tree()->BuildLayerListForTesting();
   FakePictureLayerImpl* layer_impl = static_cast<FakePictureLayerImpl*>(
       host_impl.pending_tree()->root_layer_for_testing());
   layer->PushPropertiesTo(layer_impl);
 
@@ skipping 16 matching lines @@
   layer->SetIsDrawable(true);
   layer->SavePaintProperties();
 
   gfx::Rect invalidation_bounds(layer_size);
 
   // The important line is the following (note that we do not call Update):
   layer->SetNeedsDisplayRect(invalidation_bounds);
 
   host->CommitComplete();
   FakeImplTaskRunnerProvider impl_task_runner_provider;
-  TestSharedBitmapManager shared_bitmap_manager;
   std::unique_ptr<CompositorFrameSink> compositor_frame_sink(
       FakeCompositorFrameSink::Create3d());
   LayerTreeSettings layer_tree_settings = LayerTreeSettingsForTesting();
   layer_tree_settings.image_decode_tasks_enabled = true;
-  FakeLayerTreeHostImpl host_impl(layer_tree_settings,
-                                  &impl_task_runner_provider,
-                                  &shared_bitmap_manager, &task_graph_runner);
+  FakeLayerTreeHostImpl host_impl(
+      layer_tree_settings, &impl_task_runner_provider, &task_graph_runner);
   host_impl.SetVisible(true);
   host_impl.InitializeRenderer(compositor_frame_sink.get());
   host_impl.CreatePendingTree();
   host_impl.pending_tree()->SetRootLayerForTesting(
       FakePictureLayerImpl::Create(host_impl.pending_tree(), 1));
   host_impl.pending_tree()->BuildLayerListForTesting();
   FakePictureLayerImpl* layer_impl = static_cast<FakePictureLayerImpl*>(
       host_impl.pending_tree()->root_layer_for_testing());
   layer->PushPropertiesTo(layer_impl);
 
@@ skipping 20 matching lines @@
 
   EXPECT_EQ(0, host->SourceFrameNumber());
   host->CommitComplete();
   EXPECT_EQ(1, host->SourceFrameNumber());
 
   layer->SavePaintProperties();
   layer->Update();
 
   FakeImplTaskRunnerProvider impl_task_runner_provider;
 
-  TestSharedBitmapManager shared_bitmap_manager;
   std::unique_ptr<CompositorFrameSink> compositor_frame_sink(
       FakeCompositorFrameSink::Create3d());
   LayerTreeSettings layer_tree_settings = LayerTreeSettingsForTesting();
   layer_tree_settings.image_decode_tasks_enabled = true;
-  FakeLayerTreeHostImpl host_impl(layer_tree_settings,
-                                  &impl_task_runner_provider,
-                                  &shared_bitmap_manager, &task_graph_runner);
+  FakeLayerTreeHostImpl host_impl(
+      layer_tree_settings, &impl_task_runner_provider, &task_graph_runner);
   host_impl.SetVisible(true);
   EXPECT_TRUE(host_impl.InitializeRenderer(compositor_frame_sink.get()));
 
   host_impl.CreatePendingTree();
   host_impl.pending_tree()->SetRootLayerForTesting(
       FakePictureLayerImpl::Create(host_impl.pending_tree(), 1));
   host_impl.pending_tree()->BuildLayerListForTesting();
 
   FakePictureLayerImpl* layer_impl = static_cast<FakePictureLayerImpl*>(
       host_impl.pending_tree()->root_layer_for_testing());
@@ skipping 78 matching lines @@
 // non-monotonically. This executes that code path under this scenario allowing
 // for the code to verify correctness with DCHECKs.
 TEST(PictureLayerTest, NonMonotonicSourceFrameNumber) {
   LayerTreeSettings settings = LayerTreeSettingsForTesting();
   settings.single_thread_proxy_scheduler = false;
   settings.use_zero_copy = true;
 
   StubLayerTreeHostSingleThreadClient single_thread_client;
   FakeLayerTreeHostClient host_client1;
   FakeLayerTreeHostClient host_client2;
-  TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
 
   ContentLayerClient* client = EmptyContentLayerClient::GetInstance();
   scoped_refptr<FakePictureLayer> layer = FakePictureLayer::Create(client);
 
   LayerTreeHostInProcess::InitParams params;
   params.client = &host_client1;
-  params.shared_bitmap_manager = &shared_bitmap_manager;
   params.settings = &settings;
   params.task_graph_runner = &task_graph_runner;
   params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params.animation_host = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<LayerTreeHost> host1 =
       LayerTreeHostInProcess::CreateSingleThreaded(&single_thread_client,
                                                    &params);
   host1->SetVisible(true);
   host_client1.SetLayerTreeHost(host1.get());
 
   // TODO(sad): InitParams will be movable.
   LayerTreeHostInProcess::InitParams params2;
   params2.client = &host_client1;
-  params2.shared_bitmap_manager = &shared_bitmap_manager;
   params2.settings = &settings;
   params2.task_graph_runner = &task_graph_runner;
   params2.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params2.client = &host_client2;
   params2.animation_host =
       AnimationHost::CreateForTesting(ThreadInstance::MAIN);
   std::unique_ptr<LayerTreeHost> host2 =
       LayerTreeHostInProcess::CreateSingleThreaded(&single_thread_client,
                                                    &params2);
   host2->SetVisible(true);
@@ skipping 21 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->SourceFrameNumber());
 }
 
 }  // namespace
 }  // namespace cc