Commit 38091326 authored by Fady Samuel's avatar Fady Samuel Committed by Commit Bot

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

Surface synchronization unit tests use CompositorFrameSinkSupport and
FrameSinkManager which makes them part of the frame_sinks layer.
This CL moves the file to components/viz/service/frame_sinks,
updating includes, namespaces and forward declarations as appropriate.

Bug: 722935
TBR: piman@chromium.org
Change-Id: Ic8395dd78dfdcbe10caaef8377998843d01bad0f
Reviewed-on: https://chromium-review.googlesource.com/572385Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Reviewed-by: default avatarRobert Kroeger <rjkroege@chromium.org>
Commit-Queue: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487214}
parent 72c8fe5b
...@@ -838,7 +838,6 @@ cc_test("cc_unittests") { ...@@ -838,7 +838,6 @@ cc_test("cc_unittests") {
"animation/transform_operations_unittest.cc", "animation/transform_operations_unittest.cc",
"surfaces/surface_hittest_unittest.cc", "surfaces/surface_hittest_unittest.cc",
"surfaces/surface_manager_ref_unittest.cc", "surfaces/surface_manager_ref_unittest.cc",
"surfaces/surface_synchronization_unittest.cc",
"surfaces/surface_unittest.cc", "surfaces/surface_unittest.cc",
# Setup. # Setup.
......
...@@ -33,6 +33,12 @@ ...@@ -33,6 +33,12 @@
#include <string> #include <string>
#endif #endif
namespace viz {
namespace test {
class SurfaceSynchronizationTest;
}
} // namespace viz
namespace cc { namespace cc {
struct BeginFrameAck; struct BeginFrameAck;
...@@ -40,10 +46,6 @@ struct BeginFrameArgs; ...@@ -40,10 +46,6 @@ struct BeginFrameArgs;
class CompositorFrame; class CompositorFrame;
class Surface; class Surface;
namespace test {
class SurfaceSynchronizationTest;
}
class CC_SURFACES_EXPORT SurfaceManager { class CC_SURFACES_EXPORT SurfaceManager {
public: public:
enum class LifetimeType { enum class LifetimeType {
...@@ -184,7 +186,7 @@ class CC_SURFACES_EXPORT SurfaceManager { ...@@ -184,7 +186,7 @@ class CC_SURFACES_EXPORT SurfaceManager {
} }
private: private:
friend class test::SurfaceSynchronizationTest; friend class viz::test::SurfaceSynchronizationTest;
friend class SurfaceManagerRefTest; friend class SurfaceManagerRefTest;
using SurfaceIdSet = std::unordered_set<viz::SurfaceId, viz::SurfaceIdHash>; using SurfaceIdSet = std::unordered_set<viz::SurfaceId, viz::SurfaceIdHash>;
......
...@@ -138,6 +138,7 @@ viz_source_set("unit_tests") { ...@@ -138,6 +138,7 @@ viz_source_set("unit_tests") {
"frame_sinks/direct_layer_tree_frame_sink_unittest.cc", "frame_sinks/direct_layer_tree_frame_sink_unittest.cc",
"frame_sinks/frame_sink_manager_unittest.cc", "frame_sinks/frame_sink_manager_unittest.cc",
"frame_sinks/referenced_surface_tracker_unittest.cc", "frame_sinks/referenced_surface_tracker_unittest.cc",
"frame_sinks/surface_synchronization_unittest.cc",
"hit_test/hit_test_aggregator_unittest.cc", "hit_test/hit_test_aggregator_unittest.cc",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment