viz: Move FrameSinkManager to components/viz/service/frame_sinks

This CL moves FrameSinkManager, FrameSinkManagerClient and FrameSinkManager's unittests to components/viz/service/frame_sinks. The rest of this CL updates includes, forward declarations, and namespaces. Note that there is confusion between cc::mojom::FrameSinkManager and viz::FrameSinkManager at the momenet and so viz:: needs to be used in FrameSinkManagerImpl to disambiguate. TBR=reveman@chromium.org Bug: 722935 Change-Id: I4497699fe7e3654d1562781263f836d983af2d2b Reviewed-on: https://chromium-review.googlesource.com/570000 Commit-Queue: Fady Samuel <fsamuel@chromium.org> Reviewed-by: Bo Liu <boliu@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Antoine Labour <piman@chromium.org> Cr-Commit-Position: refs/heads/master@{#486493}
Denger-Network · Jul 13, 2017 · 764e0a4 · 764e0a4
1 parent 7ae7c18
commit 764e0a4
Show file tree

Hide file tree

Showing 72 changed files with 290 additions and 283 deletions.
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
@@ -15,9 +15,9 @@
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "components/viz/common/surfaces/local_surface_id_allocator.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_bindings.h"
 

diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
@@ -17,11 +17,11 @@
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/scheduler/begin_frame_source.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "components/viz/common/surfaces/local_surface_id_allocator.h"
 #include "components/viz/service/display/display.h"
 #include "components/viz/service/display/display_scheduler.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
@@ -54,7 +54,7 @@ SurfacesInstance::SurfacesInstance()
   // Webview does not own the surface so should not clear it.
   settings.should_clear_root_render_pass = false;
 
-  frame_sink_manager_.reset(new cc::FrameSinkManager);
+  frame_sink_manager_.reset(new viz::FrameSinkManager);
   local_surface_id_allocator_.reset(new viz::LocalSurfaceIdAllocator());
 
   constexpr bool is_root = true;
@@ -106,7 +106,7 @@ viz::FrameSinkId SurfacesInstance::AllocateFrameSinkId() {
   return frame_sink_id_allocator_.NextFrameSinkId();
 }
 
-cc::FrameSinkManager* SurfacesInstance::GetFrameSinkManager() {
+viz::FrameSinkManager* SurfacesInstance::GetFrameSinkManager() {
   return frame_sink_manager_.get();
 }
 

diff --git a/android_webview/browser/surfaces_instance.h b/android_webview/browser/surfaces_instance.h
@@ -17,7 +17,6 @@
 
 namespace cc {
 class BeginFrameSource;
-class FrameSinkManager;
 }
 
 namespace gfx {
@@ -29,6 +28,7 @@ class Transform;
 namespace viz {
 class CompositorFrameSinkSupport;
 class Display;
+class FrameSinkManager;
 class LocalSurfaceIdAllocator;
 }  // namespace viz
 
@@ -43,7 +43,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
   static scoped_refptr<SurfacesInstance> GetOrCreateInstance();
 
   viz::FrameSinkId AllocateFrameSinkId();
-  cc::FrameSinkManager* GetFrameSinkManager();
+  viz::FrameSinkManager* GetFrameSinkManager();
 
   void DrawAndSwap(const gfx::Size& viewport,
                    const gfx::Rect& clip,
@@ -82,7 +82,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,
 
   viz::FrameSinkId frame_sink_id_;
 
-  std::unique_ptr<cc::FrameSinkManager> frame_sink_manager_;
+  std::unique_ptr<viz::FrameSinkManager> frame_sink_manager_;
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
   std::unique_ptr<viz::Display> display_;
   std::unique_ptr<viz::LocalSurfaceIdAllocator> local_surface_id_allocator_;

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
@@ -839,9 +839,6 @@ cc_test("cc_unittests") {
     "animation/keyframed_animation_curve_unittest.cc",
     "animation/scroll_offset_animation_curve_unittest.cc",
     "animation/transform_operations_unittest.cc",
-
-    # Surfaces test files.
-    "surfaces/frame_sink_manager_unittest.cc",
     "surfaces/referenced_surface_tracker_unittest.cc",
     "surfaces/surface_hittest_unittest.cc",
     "surfaces/surface_manager_ref_unittest.cc",

diff --git a/cc/surfaces/BUILD.gn b/cc/surfaces/BUILD.gn
@@ -28,9 +28,6 @@ cc_component("surfaces") {
   sources = [
     "direct_surface_reference_factory.cc",
     "direct_surface_reference_factory.h",
-    "frame_sink_manager.cc",
-    "frame_sink_manager.h",
-    "frame_sink_manager_client.h",
     "primary_begin_frame_source.cc",
     "primary_begin_frame_source.h",
     "referenced_surface_tracker.cc",

diff --git a/cc/surfaces/frame_sink_manager_client.h b/cc/surfaces/frame_sink_manager_client.h
diff --git a/cc/surfaces/primary_begin_frame_source.h b/cc/surfaces/primary_begin_frame_source.h
@@ -7,15 +7,17 @@
 
 #include "base/containers/flat_set.h"
 #include "cc/scheduler/begin_frame_source.h"
+#include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 
 // PrimaryBeginFrameSource echos the first BeginFrameSource in the system.
 // If the first source goes away then it will echo the new first
 // BeginFrameSource.
-class PrimaryBeginFrameSource : public BeginFrameSource,
-                                public BeginFrameObserver,
-                                public ExternalBeginFrameSourceClient {
+class CC_SURFACES_EXPORT PrimaryBeginFrameSource
+    : public BeginFrameSource,
+      public BeginFrameObserver,
+      public ExternalBeginFrameSourceClient {
  public:
   PrimaryBeginFrameSource();
   ~PrimaryBeginFrameSource() override;

diff --git a/cc/surfaces/surface_hittest_unittest.cc b/cc/surfaces/surface_hittest_unittest.cc
@@ -5,14 +5,14 @@
 #include <stddef.h>
 
 #include "cc/output/compositor_frame.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_hittest.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/compositor_frame_helpers.h"
 #include "cc/test/surface_hittest_test_helpers.h"
 #include "components/viz/common/surfaces/local_surface_id_allocator.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/size.h"
@@ -66,7 +66,7 @@ using namespace test;
 // This test verifies that hit testing on a surface that does not exist does
 // not crash.
 TEST(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
-  FrameSinkManager manager;
+  viz::FrameSinkManager manager;
   viz::FrameSinkId root_frame_sink_id(kArbitraryFrameSinkId);
   auto root_support = viz::CompositorFrameSinkSupport::Create(
       nullptr, &manager, kArbitraryFrameSinkId, kIsRoot,
@@ -108,7 +108,7 @@ TEST(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface) {
-  FrameSinkManager manager;
+  viz::FrameSinkManager manager;
 
   // Set up root FrameSink.
   viz::FrameSinkId root_frame_sink_id(1, 1);
@@ -142,7 +142,7 @@ TEST(SurfaceHittestTest, Hittest_SingleSurface) {
 }
 
 TEST(SurfaceHittestTest, Hittest_ChildSurface) {
-  FrameSinkManager manager;
+  viz::FrameSinkManager manager;
 
   // Set up root FrameSink.
   viz::FrameSinkId root_frame_sink_id(1, 1);
@@ -283,7 +283,7 @@ TEST(SurfaceHittestTest, Hittest_ChildSurface) {
 // This test verifies that hit testing will progress to the next quad if it
 // encounters an invalid RenderPassDrawQuad for whatever reason.
 TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
-  FrameSinkManager manager;
+  viz::FrameSinkManager manager;
 
   // Set up root FrameSink.
   viz::FrameSinkId root_frame_sink_id(1, 1);
@@ -392,7 +392,7 @@ TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
 }
 
 TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
-  FrameSinkManager manager;
+  viz::FrameSinkManager manager;
   viz::FrameSinkId root_frame_sink_id(kArbitraryFrameSinkId);
   auto support = viz::CompositorFrameSinkSupport::Create(
       nullptr, &manager, root_frame_sink_id, kIsRoot,
@@ -494,7 +494,7 @@ TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
-  FrameSinkManager manager;
+  viz::FrameSinkManager manager;
 
   // Set up root FrameSink.
   viz::FrameSinkId root_frame_sink_id(1, 1);

diff --git a/cc/surfaces/surface_manager_ref_unittest.cc b/cc/surfaces/surface_manager_ref_unittest.cc
@@ -9,12 +9,12 @@
 
 #include "base/containers/flat_set.h"
 #include "base/memory/ptr_util.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/compositor_frame_helpers.h"
 #include "components/viz/common/surfaces/surface_id.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -112,7 +112,7 @@ class SurfaceManagerRefTest : public testing::Test {
   // testing::Test:
   void SetUp() override {
     // Start each test with a fresh SurfaceManager instance.
-    manager_ = base::MakeUnique<FrameSinkManager>(
+    manager_ = base::MakeUnique<viz::FrameSinkManager>(
         SurfaceManager::LifetimeType::REFERENCES);
   }
   void TearDown() override {
@@ -126,7 +126,7 @@ class SurfaceManagerRefTest : public testing::Test {
                      std::unique_ptr<viz::CompositorFrameSinkSupport>,
                      viz::FrameSinkIdHash>
       supports_;
-  std::unique_ptr<FrameSinkManager> manager_;
+  std::unique_ptr<viz::FrameSinkManager> manager_;
 };
 
 TEST_F(SurfaceManagerRefTest, AddReference) {

diff --git a/cc/surfaces/surface_synchronization_unittest.cc b/cc/surfaces/surface_synchronization_unittest.cc
@@ -3,14 +3,14 @@
 // found in the LICENSE file.
 
 #include "base/containers/flat_set.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/compositor_frame_helpers.h"
 #include "cc/test/fake_external_begin_frame_source.h"
 #include "cc/test/fake_surface_observer.h"
 #include "cc/test/mock_compositor_frame_sink_support_client.h"
 #include "components/viz/common/surfaces/surface_id.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -102,7 +102,7 @@ class SurfaceSynchronizationTest : public testing::Test {
     return support(index).GetCurrentSurfaceForTesting();
   }
 
-  FrameSinkManager& frame_sink_manager() { return frame_sink_manager_; }
+  viz::FrameSinkManager& frame_sink_manager() { return frame_sink_manager_; }
 
   // Returns all the references where |surface_id| is the parent.
   const base::flat_set<viz::SurfaceId>& GetChildReferences(
@@ -188,7 +188,7 @@ class SurfaceSynchronizationTest : public testing::Test {
   testing::NiceMock<MockCompositorFrameSinkSupportClient> support_client_;
 
  private:
-  FrameSinkManager frame_sink_manager_;
+  viz::FrameSinkManager frame_sink_manager_;
   FakeSurfaceObserver surface_observer_;
   FakeExternalBeginFrameSourceClient begin_frame_source_client_;
   std::unique_ptr<FakeExternalBeginFrameSource> begin_frame_source_;

diff --git a/cc/surfaces/surface_unittest.cc b/cc/surfaces/surface_unittest.cc
@@ -5,14 +5,14 @@
 #include "cc/surfaces/surface.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_result.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "cc/surfaces/surface_dependency_tracker.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/compositor_frame_helpers.h"
 #include "cc/test/fake_external_begin_frame_source.h"
 #include "cc/test/scheduler_test_common.h"
 #include "components/viz/common/surfaces/local_surface_id_allocator.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -25,7 +25,7 @@ constexpr bool kHandlesFrameSinkIdInvalidation = true;
 constexpr bool kNeedsSyncPoints = true;
 
 TEST(SurfaceTest, SurfaceLifetime) {
-  FrameSinkManager frame_sink_manager;
+  viz::FrameSinkManager frame_sink_manager;
   SurfaceManager* surface_manager = frame_sink_manager.surface_manager();
   auto support = viz::CompositorFrameSinkSupport::Create(
       nullptr, &frame_sink_manager, kArbitraryFrameSinkId, kIsRoot,
@@ -57,7 +57,7 @@ void TestCopyResultCallback(bool* called,
 // Test that CopyOutputRequests can outlive the current frame and be
 // aggregated on the next frame.
 TEST(SurfaceTest, CopyRequestLifetime) {
-  FrameSinkManager frame_sink_manager;
+  viz::FrameSinkManager frame_sink_manager;
   SurfaceManager* surface_manager = frame_sink_manager.surface_manager();
   auto support = viz::CompositorFrameSinkSupport::Create(
       nullptr, &frame_sink_manager, kArbitraryFrameSinkId, kIsRoot,

diff --git a/components/exo/BUILD.gn b/components/exo/BUILD.gn
@@ -140,6 +140,7 @@ source_set("unit_tests") {
     "//cc:test_support",
     "//cc/surfaces:surfaces",
     "//components/user_manager",
+    "//components/viz/service",
     "//device/gamepad:test_helpers",
     "//gpu/command_buffer/client:gles2_interface",
     "//skia",

diff --git a/components/exo/DEPS b/components/exo/DEPS
@@ -3,6 +3,7 @@ include_rules = [
   "+cc",
   "+chromeos/audio/chromeos_sounds.h",
   "+components/viz/common/quads",
+  "+components/viz/service",
   "+device/gamepad",
   "+gpu",
   "+mojo/public/cpp",

diff --git a/components/exo/surface_unittest.cc b/components/exo/surface_unittest.cc
@@ -6,13 +6,13 @@
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "cc/test/fake_external_begin_frame_source.h"
 #include "components/exo/buffer.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "components/exo/test/exo_test_helper.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/compositor/layer_tree_owner.h"

diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
@@ -40,6 +40,9 @@ viz_component("service") {
     "frame_sinks/frame_eviction_manager.h",
     "frame_sinks/frame_evictor.cc",
     "frame_sinks/frame_evictor.h",
+    "frame_sinks/frame_sink_manager.cc",
+    "frame_sinks/frame_sink_manager.h",
+    "frame_sinks/frame_sink_manager_client.h",
     "frame_sinks/frame_sink_manager_impl.cc",
     "frame_sinks/frame_sink_manager_impl.h",
     "frame_sinks/gpu_compositor_frame_sink.cc",
@@ -122,6 +125,7 @@ viz_source_set("unit_tests") {
     "display_embedder/server_shared_bitmap_manager_unittest.cc",
     "frame_sinks/compositor_frame_sink_support_unittest.cc",
     "frame_sinks/direct_layer_tree_frame_sink_unittest.cc",
+    "frame_sinks/frame_sink_manager_unittest.cc",
   ]
 
   if (!use_aura && !is_mac) {

diff --git a/components/viz/service/display/display_unittest.cc b/components/viz/service/display/display_unittest.cc
@@ -13,7 +13,6 @@
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/render_pass.h"
 #include "cc/scheduler/begin_frame_source.h"
-#include "cc/surfaces/frame_sink_manager.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/compositor_frame_helpers.h"
@@ -26,6 +25,7 @@
 #include "components/viz/service/display/display_client.h"
 #include "components/viz/service/display/display_scheduler.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
+#include "components/viz/service/frame_sinks/frame_sink_manager.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -154,7 +154,7 @@ class DisplayTest : public testing::Test {
     support_->SubmitCompositorFrame(local_surface_id, std::move(frame));
   }
 
-  cc::FrameSinkManager manager_;
+  FrameSinkManager manager_;
   std::unique_ptr<CompositorFrameSinkSupport> support_;
   LocalSurfaceIdAllocator id_allocator_;
   scoped_refptr<base::NullTaskRunner> task_runner_;