cc/trees/layer_tree_host_impl_unittest.cc - Issue 376683004: Pass resourceless software mode in BeginFrameArgs

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 376683004: Pass resourceless software mode in BeginFrameArgs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comment, clang-format Created 6 years, 5 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

Download patch

« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | content/browser/android/in_process/synchronous_compositor_output_surface.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_host_impl_unittest.cc

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

index f76abbb239e78ce345f051cc2ef6a4630f5f18f7..ae2253b6b96c0333d09a82d866b4e5101908bda7 100644

--- a/cc/trees/layer_tree_host_impl_unittest.cc

+++ b/cc/trees/layer_tree_host_impl_unittest.cc

@@ -5586,8 +5586,14 @@ TEST_F(LayerTreeHostImplTest, ForcedDrawToSoftwareDeviceBasicRender) {

SetupScrollAndContentsLayers(gfx::Size(100, 100));

- output_surface->set_forced_draw_to_software_device(true);

- EXPECT_TRUE(output_surface->ForcedDrawToSoftwareDevice());

+ const gfx::Transform external_transform;

+ const gfx::Rect external_viewport;

+ const gfx::Rect external_clip;

+ const bool resourceless_software_draw = true;

+ host_impl_->SetExternalDrawConstraints(external_transform,

+ external_viewport,

+ external_clip,

+ resourceless_software_draw);

EXPECT_EQ(0, software_device->frames_began_);

EXPECT_EQ(0, software_device->frames_ended_);

@@ -5613,8 +5619,14 @@ TEST_F(LayerTreeHostImplTest,

EXPECT_TRUE(CreateHostImpl(DefaultSettings(),

scoped_ptr<OutputSurface>(output_surface)));

- output_surface->set_forced_draw_to_software_device(true);

- EXPECT_TRUE(output_surface->ForcedDrawToSoftwareDevice());

+ const gfx::Transform external_transform;

+ const gfx::Rect external_viewport;

+ const gfx::Rect external_clip;

+ const bool resourceless_software_draw = true;

+ host_impl_->SetExternalDrawConstraints(external_transform,

+ external_viewport,

+ external_clip,

+ resourceless_software_draw);

// SolidColorLayerImpl will be drawn.

scoped_ptr<SolidColorLayerImpl> root_layer =

@@ -6702,13 +6714,13 @@ TEST_F(LayerTreeHostImplTest, ExternalTransformReflectedInNextDraw) {

gfx::Transform external_transform;

const gfx::Rect external_viewport(layer_size);

const gfx::Rect external_clip(layer_size);

- const bool valid_for_tile_management = true;

+ const bool resourceless_software_draw = false;

LayerImpl* layer = SetupScrollAndContentsLayers(layer_size);

host_impl_->SetExternalDrawConstraints(external_transform,

external_viewport,

external_clip,

- valid_for_tile_management);

+ resourceless_software_draw);

DrawFrame();

EXPECT_TRANSFORMATION_MATRIX_EQ(

external_transform, layer->draw_properties().target_space_transform);

@@ -6717,7 +6729,7 @@ TEST_F(LayerTreeHostImplTest, ExternalTransformReflectedInNextDraw) {

host_impl_->SetExternalDrawConstraints(external_transform,

external_viewport,

external_clip,

- valid_for_tile_management);

+ resourceless_software_draw);

DrawFrame();

EXPECT_TRANSFORMATION_MATRIX_EQ(

external_transform, layer->draw_properties().target_space_transform);