Fix the errors of ui unittests caused by packing colors for Android

webkit/media/skcanvas_video_renderer_unittest.cc

 // Copyright (c) 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 "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/media/skcanvas_video_renderer.h"
@@ skipping 91 matching lines @@
     case kRed:
       media::FillYUV(video_frame, 76, 84, 255);
       break;
     case kBlue:
       media::FillYUV(video_frame, 29, 255, 107);
       break;
   }
   renderer_.Paint(video_frame, canvas, kNaturalRect, 0xFF);
 }
 
+inline uint32_t SetPackedColor(uint8_t a, uint8_t r, uint8_t g, uint8_t b) {
+  return (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
+         (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
+}
+
+#define ColorRed SetPackedColor(0xFF, 0xFF, 0x00, 0x00)
+#define ColorGreen SetPackedColor(0xFF, 0x00, 0xFF, 0x00)
+#define ColorBlue SetPackedColor(0xFF, 0x00, 0x00, 0xFF)
+
 TEST_F(SkCanvasVideoRendererTest, FastPaint_NoFrame) {
   // Test that black gets painted over canvas.
   FillCanvas(fast_path_canvas(), SK_ColorRED);
   PaintWithoutFrame(fast_path_canvas());
   EXPECT_EQ(SK_ColorBLACK, GetColor(fast_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_NoFrame) {
   // Test that black gets painted over canvas.
   FillCanvas(slow_path_canvas(), SK_ColorRED);
   PaintWithoutFrame(slow_path_canvas());
   EXPECT_EQ(SK_ColorBLACK, GetColor(slow_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, FastPaint_Natural) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(fast_path_canvas()));

[Ami GONE FROM CHROMIUM, 2012/07/26 17:20:03]

I don't know skia very much at all, but skimming
third_party/skia/include/core/SkColor.h this change seems wrong.  SkColor is
meant to be platform-configuration-independent (as opposed to the
platform-specific SkPMColor).
In fact SkBitmap::getColor() un-pre-multiplies its return value from SkPMColor
to SkColor.

Does this mean this change should be reverted and actually a skia bug fixed?

[yongsheng, 2012/08/06 06:37:21]

yes, i think you're right after I read the code in skia.
SkBitmap::getColor() should return platform-independent value. 

These failures are due to the conversion between YUV and argb32 has the
assumption: the target bitmap internal format
is argb32 while it's not true for chrome for Android. So it's a bug in
webkit/media/skcanvas_video_renderer.cc. I think it's better to split this bug
with current other failures: this issue is more complex. I'll create a new issue
for this issue.

 }
 
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_Natural) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(slow_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, FastPaint_Larger) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(fast_path_canvas()));
 
   Paint(larger_frame(), fast_path_canvas(), kBlue);
-  EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorBlue, GetColor(fast_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_Larger) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(slow_path_canvas()));
 
   Paint(larger_frame(), slow_path_canvas(), kBlue);
-  EXPECT_EQ(SK_ColorBLUE, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorBlue, GetColor(slow_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, FastPaint_Smaller) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(fast_path_canvas()));
 
   Paint(smaller_frame(), fast_path_canvas(), kBlue);
-  EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorBlue, GetColor(fast_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_Smaller) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(slow_path_canvas()));
 
   Paint(smaller_frame(), slow_path_canvas(), kBlue);
-  EXPECT_EQ(SK_ColorBLUE, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorBlue, GetColor(slow_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, FastPaint_NoTimestamp) {
   VideoFrame* video_frame = natural_frame();
   video_frame->SetTimestamp(media::kNoTimestamp());
   Paint(video_frame, fast_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(fast_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_NoTimestamp) {
   VideoFrame* video_frame = natural_frame();
   video_frame->SetTimestamp(media::kNoTimestamp());
   Paint(video_frame, slow_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(slow_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, FastPaint_SameVideoFrame) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(fast_path_canvas()));
 
   // Fast paints always get painted to the canvas.
   Paint(natural_frame(), fast_path_canvas(), kBlue);
-  EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
+  EXPECT_EQ(ColorBlue, GetColor(fast_path_canvas()));
 }
 
 TEST_F(SkCanvasVideoRendererTest, SlowPaint_SameVideoFrame) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
-  EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(slow_path_canvas()));
 
   // Slow paints can get cached, expect the old color value.
   Paint(natural_frame(), slow_path_canvas(), kBlue);
-  EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
+  EXPECT_EQ(ColorRed, GetColor(slow_path_canvas()));
 }
 
 }  // namespace webkit_media