cc/output/software_renderer_unittest.cc - Issue 899183003: Fix double lock of texture resource in software renderer

Unified Diff: cc/output/software_renderer_unittest.cc

Issue 899183003: Fix double lock of texture resource in software renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove test and add comments Created 5 years, 10 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

Index: cc/output/software_renderer_unittest.cc

diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc

index 7f689a8eba169d23c6c8376964b119f796593a30..cead9a1f242e9e7cabaaf16112b833e6eacbf891 100644

--- a/cc/output/software_renderer_unittest.cc

+++ b/cc/output/software_renderer_unittest.cc

@@ -62,6 +62,7 @@ class SoftwareRendererTest : public testing::Test, public RendererClient {

scoped_ptr<SkBitmap> bitmap_result;

base::RunLoop loop;

+ CHECK(!list->empty());

danakj 2015/02/06 23:11:42 I don't think we need this, back() will crash inst

list->back()->copy_requests.push_back(

CopyOutputRequest::CreateBitmapRequest(

base::Bind(&SoftwareRendererTest::SaveBitmapResult,

@@ -135,7 +136,7 @@ TEST_F(SoftwareRendererTest, SolidColorQuad) {

scoped_ptr<SkBitmap> output =

DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);

EXPECT_EQ(outer_rect.width(), output->info().fWidth);

- EXPECT_EQ(outer_rect.width(), output->info().fHeight);

+ EXPECT_EQ(outer_rect.height(), output->info().fHeight);

EXPECT_EQ(SK_ColorYELLOW, output->getColor(0, 0));

EXPECT_EQ(SK_ColorYELLOW,

@@ -233,7 +234,7 @@ TEST_F(SoftwareRendererTest, TileQuad) {

scoped_ptr<SkBitmap> output =

DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);

EXPECT_EQ(outer_rect.width(), output->info().fWidth);

- EXPECT_EQ(outer_rect.width(), output->info().fHeight);

+ EXPECT_EQ(outer_rect.height(), output->info().fHeight);

EXPECT_EQ(SK_ColorYELLOW, output->getColor(0, 0));

EXPECT_EQ(SK_ColorYELLOW,

@@ -308,7 +309,7 @@ TEST_F(SoftwareRendererTest, TileQuadVisibleRect) {

scoped_ptr<SkBitmap> output =

DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);

EXPECT_EQ(tile_rect.width(), output->info().fWidth);

- EXPECT_EQ(tile_rect.width(), output->info().fHeight);

+ EXPECT_EQ(tile_rect.height(), output->info().fHeight);

// Check portion of tile not in visible rect isn't drawn.

const unsigned int kTransparent = SK_ColorTRANSPARENT;

@@ -350,7 +351,7 @@ TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) {

scoped_ptr<SkBitmap> output =

DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);

EXPECT_EQ(device_viewport_rect.width(), output->info().fWidth);

- EXPECT_EQ(device_viewport_rect.width(), output->info().fHeight);

+ EXPECT_EQ(device_viewport_rect.height(), output->info().fHeight);

EXPECT_EQ(SK_ColorGREEN, output->getColor(0, 0));

EXPECT_EQ(SK_ColorGREEN,

@@ -372,7 +373,7 @@ TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) {

output = DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);

EXPECT_EQ(device_viewport_rect.width(), output->info().fWidth);

- EXPECT_EQ(device_viewport_rect.width(), output->info().fHeight);

+ EXPECT_EQ(device_viewport_rect.height(), output->info().fHeight);

// If we didn't clear, the borders should still be green.

EXPECT_EQ(SK_ColorGREEN, output->getColor(0, 0));

@@ -417,7 +418,7 @@ TEST_F(SoftwareRendererTest, RenderPassVisibleRect) {

scoped_ptr<SkBitmap> output =

DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);

EXPECT_EQ(device_viewport_rect.width(), output->info().fWidth);

- EXPECT_EQ(device_viewport_rect.width(), output->info().fHeight);

+ EXPECT_EQ(device_viewport_rect.height(), output->info().fHeight);

EXPECT_EQ(SK_ColorGREEN, output->getColor(0, 0));

EXPECT_EQ(SK_ColorGREEN,

« no previous file with comments | « cc/output/software_renderer.cc ('k') | cc/trees/layer_tree_host_pixeltest_readback.cc » ('j') | cc/trees/layer_tree_host_pixeltest_readback.cc » ('J')