| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/surfaces/compositor_frame_sink_support.h" | 5 #include "cc/surfaces/compositor_frame_sink_support.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
| 9 #include "cc/surfaces/compositor_frame_sink_support_client.h" | 9 #include "cc/surfaces/compositor_frame_sink_support_client.h" |
| 10 #include "cc/surfaces/frame_sink_id.h" | 10 #include "cc/surfaces/frame_sink_id.h" |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 // testing::Test: | 129 // testing::Test: |
| 130 void SetUp() override { | 130 void SetUp() override { |
| 131 testing::Test::SetUp(); | 131 testing::Test::SetUp(); |
| 132 begin_frame_source_ = | 132 begin_frame_source_ = |
| 133 base::MakeUnique<FakeExternalBeginFrameSource>(0.f, false); | 133 base::MakeUnique<FakeExternalBeginFrameSource>(0.f, false); |
| 134 std::unique_ptr<SurfaceDependencyTracker> dependency_tracker( | 134 std::unique_ptr<SurfaceDependencyTracker> dependency_tracker( |
| 135 new SurfaceDependencyTracker(&surface_manager_, | 135 new SurfaceDependencyTracker(&surface_manager_, |
| 136 begin_frame_source_.get())); | 136 begin_frame_source_.get())); |
| 137 surface_manager_.SetDependencyTracker(std::move(dependency_tracker)); | 137 surface_manager_.SetDependencyTracker(std::move(dependency_tracker)); |
| 138 supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>( | 138 supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>( |
| 139 this, &surface_manager_, kParentFrameSink, | 139 this, &surface_manager_, kParentFrameSink, false /* is_root */, |
| 140 false /* submits_to_display_compositor */)); | 140 true /* handles_frame_sink_id_invalidation */, |
| 141 true /* needs_sync_points */)); |
| 141 supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>( | 142 supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>( |
| 142 this, &surface_manager_, kChildFrameSink1, | 143 this, &surface_manager_, kChildFrameSink1, false /* is_root */, |
| 143 false /* submits_to_display_compositor */)); | 144 true /* handles_frame_sink_id_invalidation */, |
| 145 true /* needs_sync_points */)); |
| 144 supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>( | 146 supports_.push_back(base::MakeUnique<CompositorFrameSinkSupport>( |
| 145 this, &surface_manager_, kChildFrameSink2, | 147 this, &surface_manager_, kChildFrameSink2, false /* is_root */, |
| 146 false /* submits_to_display_compositor */)); | 148 true /* handles_frame_sink_id_invalidation */, |
| 149 true /* needs_sync_points */)); |
| 147 } | 150 } |
| 148 | 151 |
| 149 void TearDown() override { | 152 void TearDown() override { |
| 150 surface_manager_.SetDependencyTracker(nullptr); | 153 surface_manager_.SetDependencyTracker(nullptr); |
| 151 | 154 |
| 152 // SurfaceDependencyTracker depends on this BeginFrameSource and so it must | 155 // SurfaceDependencyTracker depends on this BeginFrameSource and so it must |
| 153 // be destroyed AFTER the dependency tracker is destroyed. | 156 // be destroyed AFTER the dependency tracker is destroyed. |
| 154 begin_frame_source_.reset(); | 157 begin_frame_source_.reset(); |
| 155 | 158 |
| 156 supports_.clear(); | 159 supports_.clear(); |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 // CompositorFrame. Also verify that |child_id1| is no longer a child | 679 // CompositorFrame. Also verify that |child_id1| is no longer a child |
| 677 // reference of |parent_id|. | 680 // reference of |parent_id|. |
| 678 EXPECT_TRUE(parent_surface()->HasActiveFrame()); | 681 EXPECT_TRUE(parent_surface()->HasActiveFrame()); |
| 679 EXPECT_FALSE(parent_surface()->HasPendingFrame()); | 682 EXPECT_FALSE(parent_surface()->HasPendingFrame()); |
| 680 EXPECT_THAT(parent_surface()->blocking_surfaces_for_testing(), IsEmpty()); | 683 EXPECT_THAT(parent_surface()->blocking_surfaces_for_testing(), IsEmpty()); |
| 681 EXPECT_THAT(GetChildReferences(parent_id), UnorderedElementsAre(child_id2)); | 684 EXPECT_THAT(GetChildReferences(parent_id), UnorderedElementsAre(child_id2)); |
| 682 } | 685 } |
| 683 | 686 |
| 684 } // namespace test | 687 } // namespace test |
| 685 } // namespace cc | 688 } // namespace cc |
| OLD | NEW |