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..fa2520078bde0422277eef0427285f1407af2ac1 100644 |
--- a/cc/output/software_renderer_unittest.cc |
+++ b/cc/output/software_renderer_unittest.cc |
@@ -135,7 +135,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 +233,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 +308,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 +350,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 +372,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 +417,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, |