Pass SkPaint instead of its alpha and mode in WebMediaPlayer::paint

media/renderers/skcanvas_video_renderer_unittest.cc

Index: media/renderers/skcanvas_video_renderer_unittest.cc
diff --git a/media/renderers/skcanvas_video_renderer_unittest.cc b/media/renderers/skcanvas_video_renderer_unittest.cc
index 1fae1d88a17a8be1abcb6002cd086c1cd7ce814d..2e018e01ff2d112cf04136db5fcafff4c679ff0f 100644
--- a/media/renderers/skcanvas_video_renderer_unittest.cc
+++ b/media/renderers/skcanvas_video_renderer_unittest.cc
@@ -206,8 +206,10 @@ SkCanvasVideoRendererTest::SkCanvasVideoRendererTest()
 SkCanvasVideoRendererTest::~SkCanvasVideoRendererTest() {}
 
 void SkCanvasVideoRendererTest::PaintWithoutFrame(SkCanvas* canvas) {
-  renderer_.Paint(nullptr, canvas, kNaturalRect, 0xFF,
-                  SkXfermode::kSrcOver_Mode, VIDEO_ROTATION_0, Context3D());
+  SkPaint paint;

[chcunningham, 2016/09/06 23:07:33]

set alpha? set mode?

[xidachen, 2016/09/07 13:23:07]

The mode is by default kSrcOver_Mode. So in Skpaint's constructor, there is a
sk_sp<SkXfermode> which is initialized to be nullptr, and nullptr is treated as
kSrcOver_Mode.

https://cs.chromium.org/chromium/src/third_party/skia/src/core/SkXfermode.cpp...

+  paint.setFilterQuality(kLow_SkFilterQuality);
+  renderer_.Paint(nullptr, canvas, kNaturalRect, &paint, VIDEO_ROTATION_0,
+                  Context3D());
 }
 
 void SkCanvasVideoRendererTest::Paint(
@@ -238,7 +240,11 @@ void SkCanvasVideoRendererTest::PaintRotated(
       media::FillYUV(video_frame.get(), 29, 255, 107);
       break;
   }
-  renderer_.Paint(video_frame, canvas, dest_rect, 0xFF, mode, video_rotation,
+  SkPaint paint;
+  paint.setXfermodeMode(mode);
+  paint.setAlpha(0xFF);

[chcunningham, 2016/09/07 16:01:12]

I see, I was thrown off by this one. I guess its probably not needed?

[xidachen, 2016/09/07 16:10:53]

Oh, damn! I totally missed it. Yes, this line is not needed. Now that I have
committed this CL, I will have a clean up for it.

+  paint.setFilterQuality(kLow_SkFilterQuality);
+  renderer_.Paint(video_frame, canvas, dest_rect, &paint, video_rotation,
                   Context3D());
 }
 
@@ -536,7 +542,9 @@ TEST_F(SkCanvasVideoRendererTest, ContextLost) {
       PIXEL_FORMAT_UYVY, holders, base::Bind(MailboxHoldersReleased), size,
       gfx::Rect(size), size, kNoTimestamp);
 
-  renderer_.Paint(video_frame, &canvas, kNaturalRect, 0xFF,
-                  SkXfermode::kSrcOver_Mode, VIDEO_ROTATION_90, context_3d);
+  SkPaint paint;

[chcunningham, 2016/09/06 23:07:33]

set alpha/mode?

+  paint.setFilterQuality(kLow_SkFilterQuality);
+  renderer_.Paint(video_frame, &canvas, kNaturalRect, &paint, VIDEO_ROTATION_90,
+                  context_3d);
 }
 }  // namespace media