cc: Use SkPMColor consistently on readback.

cc/output/software_renderer_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/software_renderer.h"
 
 #include "cc/layers/quad_sink.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/software_output_device.h"
 #include "cc/quads/render_pass.h"
@@ skipping 64 matching lines @@
   scoped_ptr<FakeOutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<SoftwareRenderer> renderer_;
   gfx::Size viewport_size_;
   LayerTreeSettings settings_;
   bool should_clear_root_render_pass_;
 };
 
 TEST_F(SoftwareRendererTest, SolidColorQuad) {
   gfx::Size outer_size(100, 100);
-#if !defined(OS_ANDROID)
   int outer_pixels = outer_size.width() * outer_size.height();
-#endif
   gfx::Size inner_size(98, 98);
   gfx::Rect outer_rect(outer_size);
   gfx::Rect inner_rect(gfx::Point(1, 1), inner_size);
   set_viewport_size(outer_size);
 
   InitializeRenderer();
 
   scoped_ptr<SharedQuadState> shared_quad_state = SharedQuadState::Create();
   shared_quad_state->SetAll(
       gfx::Transform(), outer_size, outer_rect, outer_rect, false, 1.0);
   RenderPass::Id root_render_pass_id = RenderPass::Id(1, 1);
   scoped_ptr<TestRenderPass> root_render_pass = TestRenderPass::Create();
   root_render_pass->SetNew(
       root_render_pass_id, outer_rect, outer_rect, gfx::Transform());
   scoped_ptr<SolidColorDrawQuad> outer_quad = SolidColorDrawQuad::Create();
   outer_quad->SetNew(
       shared_quad_state.get(), outer_rect, SK_ColorYELLOW, false);
   scoped_ptr<SolidColorDrawQuad> inner_quad = SolidColorDrawQuad::Create();
   inner_quad->SetNew(shared_quad_state.get(), inner_rect, SK_ColorCYAN, false);
   root_render_pass->AppendQuad(inner_quad.PassAs<DrawQuad>());
   root_render_pass->AppendQuad(outer_quad.PassAs<DrawQuad>());
 
   RenderPassList list;
   list.push_back(root_render_pass.PassAs<RenderPass>());
   renderer()->DrawFrame(&list);
 
-  scoped_ptr<SkColor[]> pixels(new SkColor[DeviceViewportSize().width() *
+  scoped_ptr<SkPMColor[]> pixels(new SkPMColor[DeviceViewportSize().width() *
       DeviceViewportSize().height()]);
   renderer()->GetFramebufferPixels(pixels.get(), outer_rect);
 
-// FIXME: This fails on Android. Endianness maybe?
-// Yellow: expects 0xFFFFFF00, was 0xFF00FFFF on android.
-// Cyan:   expects 0xFF00FFFF, was 0xFFFFFF00 on android.
-// http://crbug.com/154528
-#if !defined(OS_ANDROID)
-  EXPECT_EQ(SK_ColorYELLOW, pixels[0]);
-  EXPECT_EQ(SK_ColorYELLOW, pixels[outer_pixels - 1]);
-  EXPECT_EQ(SK_ColorCYAN, pixels[outer_size.width() + 1]);
-  EXPECT_EQ(SK_ColorCYAN, pixels[outer_pixels - outer_size.width() - 2]);
-#endif
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorYELLOW), pixels[0]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorYELLOW), pixels[outer_pixels - 1]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorCYAN), pixels[outer_size.width() + 1]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorCYAN),
+            pixels[outer_pixels - outer_size.width() - 2]);
 }
 
 TEST_F(SoftwareRendererTest, TileQuad) {
   gfx::Size outer_size(100, 100);
   int outer_pixels = outer_size.width() * outer_size.height();
   gfx::Size inner_size(98, 98);
   int inner_pixels = inner_size.width() * inner_size.height();
   gfx::Rect outer_rect(outer_size);
   gfx::Rect inner_rect(gfx::Point(1, 1), inner_size);
   set_viewport_size(outer_size);
   InitializeRenderer();
 
   ResourceProvider::ResourceId resource_yellow =
       resource_provider()->CreateResource(
           outer_size, GL_RGBA, ResourceProvider::TextureUsageAny);
   ResourceProvider::ResourceId resource_cyan =
       resource_provider()->CreateResource(
           inner_size, GL_RGBA, ResourceProvider::TextureUsageAny);
 
-  SkColor yellow = SK_ColorYELLOW;
-  SkColor cyan = SK_ColorCYAN;
-  scoped_ptr<SkColor[]> yellow_pixels(new SkColor[outer_pixels]);
-  scoped_ptr<SkColor[]> cyan_pixels(new SkColor[inner_pixels]);
+  SkPMColor yellow = SkPreMultiplyColor(SK_ColorYELLOW);

[danakj, 2013/05/08 17:38:43]

So I get that the readback is going to premultiplied, but I also find it odd
that you now have to do this premultiply thing when you SetPixels but only for a
software resource? For a GL resource, we don't do that right?

+  SkPMColor cyan = SkPreMultiplyColor(SK_ColorCYAN);
+  scoped_ptr<SkPMColor[]> yellow_pixels(new SkPMColor[outer_pixels]);
+  scoped_ptr<SkPMColor[]> cyan_pixels(new SkPMColor[inner_pixels]);
   for (int i = 0; i < outer_pixels; i++)
     yellow_pixels[i] = yellow;
   for (int i = 0; i < inner_pixels; i++)
     cyan_pixels[i] = cyan;
 
   resource_provider()->SetPixels(
       resource_yellow,
       reinterpret_cast<uint8_t*>(yellow_pixels.get()),
       gfx::Rect(outer_size),
       gfx::Rect(outer_size),
@@ skipping 29 matching lines @@
                      gfx::RectF(inner_size),
                      inner_size,
                      false);
   root_render_pass->AppendQuad(inner_quad.PassAs<DrawQuad>());
   root_render_pass->AppendQuad(outer_quad.PassAs<DrawQuad>());
 
   RenderPassList list;
   list.push_back(root_render_pass.PassAs<RenderPass>());
   renderer()->DrawFrame(&list);
 
-  scoped_ptr<SkColor[]> pixels(new SkColor[DeviceViewportSize().width() *
+  scoped_ptr<SkPMColor[]> pixels(new SkPMColor[DeviceViewportSize().width() *
       DeviceViewportSize().height()]);
   renderer()->GetFramebufferPixels(pixels.get(), outer_rect);
 
-  EXPECT_EQ(SK_ColorYELLOW, pixels[0]);
-  EXPECT_EQ(SK_ColorYELLOW, pixels[outer_pixels - 1]);
-  EXPECT_EQ(SK_ColorCYAN, pixels[outer_size.width() + 1]);
-  EXPECT_EQ(SK_ColorCYAN, pixels[outer_pixels - outer_size.width() - 2]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorYELLOW), pixels[0]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorYELLOW), pixels[outer_pixels - 1]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorCYAN), pixels[outer_size.width() + 1]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorCYAN),
+            pixels[outer_pixels - outer_size.width() - 2]);
 }
 
 TEST_F(SoftwareRendererTest, ShouldClearRootRenderPass) {
   gfx::Rect viewport_rect(0, 0, 100, 100);
   size_t viewport_pixels = viewport_rect.width() * viewport_rect.height();
   set_viewport_size(viewport_rect.size());
   set_should_clear_root_render_pass(false);
   InitializeRenderer();
 
   RenderPassList list;
-  scoped_ptr<SkColor[]> pixels(new SkColor[viewport_pixels]);
+  scoped_ptr<SkPMColor[]> pixels(new SkPMColor[viewport_pixels]);
 
   // Draw a fullscreen green quad in a first frame.
   RenderPass::Id root_clear_pass_id(1, 0);
   TestRenderPass* root_clear_pass = AddRenderPass(
       &list, root_clear_pass_id, viewport_rect, gfx::Transform());
   AddQuad(root_clear_pass, viewport_rect, SK_ColorGREEN);
 
   renderer()->DecideRenderPassAllocationsForFrame(list);
   renderer()->DrawFrame(&list);
   renderer()->GetFramebufferPixels(pixels.get(), viewport_rect);
 
-  EXPECT_EQ(SK_ColorGREEN, pixels[0]);
-  EXPECT_EQ(SK_ColorGREEN, pixels[viewport_pixels - 1]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorGREEN), pixels[0]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorGREEN), pixels[viewport_pixels - 1]);
 
   list.clear();
 
   // Draw a smaller magenta rect without filling the viewport in a separate
   // frame.
   gfx::Rect smaller_rect(20, 20, 60, 60);
 
   RenderPass::Id root_smaller_pass_id(2, 0);
   TestRenderPass* root_smaller_pass = AddRenderPass(
       &list, root_smaller_pass_id, viewport_rect, gfx::Transform());
   AddQuad(root_smaller_pass, smaller_rect, SK_ColorMAGENTA);
 
   renderer()->DecideRenderPassAllocationsForFrame(list);
   renderer()->DrawFrame(&list);
   renderer()->GetFramebufferPixels(pixels.get(), viewport_rect);
 
   // If we didn't clear, the borders should still be green.
-  EXPECT_EQ(SK_ColorGREEN, pixels[0]);
-  EXPECT_EQ(SK_ColorGREEN, pixels[viewport_pixels - 1]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorGREEN), pixels[0]);
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorGREEN), pixels[viewport_pixels - 1]);
 
   EXPECT_EQ(
-      SK_ColorMAGENTA,
+      SkPreMultiplyColor(SK_ColorMAGENTA),
       pixels[smaller_rect.y() * viewport_rect.width() + smaller_rect.x()]);
-  EXPECT_EQ(SK_ColorMAGENTA,
+  EXPECT_EQ(SkPreMultiplyColor(SK_ColorMAGENTA),
             pixels[(smaller_rect.bottom() - 1) * viewport_rect.width() +
                 smaller_rect.right() - 1]);
 }
 
 }  // namespace
 }  // namespace cc