cc/trees/layer_tree_host_common_unittest.cc - Issue 2452483002: Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 2452483002: Move GpuMemoryBufferManager and SharedBitmapManager to CompositorFrameSink (Closed)

Patch Set: compile fixes Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: cc/trees/layer_tree_host_common_unittest.cc

diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc

index 73f82c08f23181e89cc90abb2ba8005d0cf3176c..7bdadcb63cc04044f6d008c4d6d3ba085b60d84b 100644

--- a/cc/trees/layer_tree_host_common_unittest.cc

+++ b/cc/trees/layer_tree_host_common_unittest.cc

@@ -522,10 +522,8 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) {

const float kDeviceScale = 1.666f;

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

std::unique_ptr<LayerImpl> sublayer_scoped_ptr(

LayerImpl::Create(host_impl.active_tree(), 1));

@@ -3450,12 +3448,10 @@ TEST_F(LayerTreeHostCommonTest,

TEST_F(LayerTreeHostCommonTest, OcclusionBySiblingOfTarget) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

std::unique_ptr<CompositorFrameSink> compositor_frame_sink =

FakeCompositorFrameSink::Create3d();

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -3528,12 +3524,10 @@ TEST_F(LayerTreeHostCommonTest, OcclusionBySiblingOfTarget) {

TEST_F(LayerTreeHostCommonTest,

OcclusionForLayerWithUninvertibleDrawTransform) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

std::unique_ptr<CompositorFrameSink> compositor_frame_sink =

FakeCompositorFrameSink::Create3d();

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -4798,10 +4792,9 @@ TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) {

TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

FakeLayerTreeHostImpl host_impl(host()->GetSettings(), &task_runner_provider,

- &shared_bitmap_manager, &task_graph_runner);

+ &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.pending_tree(), 1);

@@ -4903,7 +4896,6 @@ class LCDTextTest : public LayerTreeHostCommonTestBase,

: LayerTreeHostCommonTestBase(LCDTextTestLayerTreeSettings()),

host_impl_(LCDTextTestLayerTreeSettings(),

&task_runner_provider_,

- &shared_bitmap_manager_,

&task_graph_runner_) {}

scoped_refptr<AnimationTimeline> timeline() { return timeline_; }

@@ -4962,7 +4954,6 @@ class LCDTextTest : public LayerTreeHostCommonTestBase,

bool layers_always_allowed_lcd_text_;

FakeImplTaskRunnerProvider task_runner_provider_;

- TestSharedBitmapManager shared_bitmap_manager_;

TestTaskGraphRunner task_graph_runner_;

FakeLayerTreeHostImpl host_impl_;

scoped_refptr<AnimationTimeline> timeline_;

@@ -5120,10 +5111,8 @@ INSTANTIATE_TEST_CASE_P(LayerTreeHostCommonTest,

TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root =

@@ -5164,10 +5153,8 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {

TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root =

@@ -5208,10 +5195,8 @@ void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {}

TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root =

@@ -5354,10 +5339,8 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {

TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root =

@@ -5864,10 +5847,8 @@ TEST_F(LayerTreeHostCommonTest,

TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 12345);

@@ -6564,10 +6545,8 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {

// + fixed

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root_ptr =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -7595,12 +7574,11 @@ class AnimationScaleFactorTrackingLayerImpl : public LayerImpl {

TEST_F(LayerTreeHostCommonTest, MaximumAnimationScaleFactor) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

LayerTreeSettings settings = host()->GetSettings();

settings.layer_transforms_should_scale_layer_contents = true;

FakeLayerTreeHostImpl host_impl(settings, &task_runner_provider,

- &shared_bitmap_manager, &task_graph_runner);

+ &task_graph_runner);

std::unique_ptr<AnimationScaleFactorTrackingLayerImpl> grand_parent =

AnimationScaleFactorTrackingLayerImpl::Create(host_impl.active_tree(), 1);

std::unique_ptr<AnimationScaleFactorTrackingLayerImpl> parent =

@@ -7853,10 +7831,8 @@ static void GatherDrawnLayers(const LayerImplList* rsll,

TEST_F(LayerTreeHostCommonTest, RenderSurfaceLayerListMembership) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

std::unique_ptr<LayerImpl> grand_parent =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -8079,12 +8055,11 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceLayerListMembership) {

TEST_F(LayerTreeHostCommonTest, DrawPropertyScales) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

LayerTreeSettings settings = host()->GetSettings();

settings.layer_transforms_should_scale_layer_contents = true;

FakeLayerTreeHostImpl host_impl(settings, &task_runner_provider,

- &shared_bitmap_manager, &task_graph_runner);

+ &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -8194,12 +8169,11 @@ TEST_F(LayerTreeHostCommonTest, DrawPropertyScales) {

TEST_F(LayerTreeHostCommonTest, AnimationScales) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

LayerTreeSettings settings = host()->GetSettings();

settings.layer_transforms_should_scale_layer_contents = true;

FakeLayerTreeHostImpl host_impl(settings, &task_runner_provider,

- &shared_bitmap_manager, &task_graph_runner);

+ &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -8273,12 +8247,11 @@ TEST_F(LayerTreeHostCommonTest,

// Returns empty scale if layer_transforms_should_scale_layer_contents is

// false.

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

LayerTreeSettings settings = host()->GetSettings();

settings.layer_transforms_should_scale_layer_contents = false;

FakeLayerTreeHostImpl host_impl(settings, &task_runner_provider,

- &shared_bitmap_manager, &task_graph_runner);

+ &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -8353,10 +8326,8 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInChildRenderSurface) {

TEST_F(LayerTreeHostCommonTest, BoundsDeltaAffectVisibleContentRect) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

// Set two layers: the root layer clips it's child,

// the child draws its content.

@@ -8984,10 +8955,8 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) {

TEST_F(LayerTreeHostCommonTest, SkippingLayerImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

std::unique_ptr<LayerImpl> root =

LayerImpl::Create(host_impl.active_tree(), 1);

@@ -9173,10 +9142,8 @@ TEST_F(LayerTreeHostCommonTest, LayerSkippingInSubtreeOfSingularTransform) {

TEST_F(LayerTreeHostCommonTest, SkippingPendingLayerImpl) {

FakeImplTaskRunnerProvider task_runner_provider;

- TestSharedBitmapManager shared_bitmap_manager;

TestTaskGraphRunner task_graph_runner;

- FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,

- &task_graph_runner);

+ FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);

host_impl.CreatePendingTree();

std::unique_ptr<LayerImpl> root =

« cc/output/compositor_frame_sink.h ('K') | « cc/trees/damage_tracker_unittest.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | content/renderer/render_thread_impl.cc » ('J')