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..6e11510bf4f524dc4ac695feb06e1f019ec79f00 100644
--- a/media/renderers/skcanvas_video_renderer_unittest.cc
+++ b/media/renderers/skcanvas_video_renderer_unittest.cc
@@ -206,8 +206,12 @@ SkCanvasVideoRendererTest::SkCanvasVideoRendererTest()
 SkCanvasVideoRendererTest::~SkCanvasVideoRendererTest() {}
 
 void SkCanvasVideoRendererTest::PaintWithoutFrame(SkCanvas* canvas) {
-  renderer_.Paint(nullptr, canvas, kNaturalRect, 0xFF,
-                  SkXfermode::kSrcOver_Mode, VIDEO_ROTATION_0, Context3D());
+  SkPaint paint;
+  paint.setXfermodeMode(SkXfermode::kSrc_Mode);

[Justin Novosad, 2016/08/25 19:18:19]

You changed SrcOver to Src. SrcOver is the default, so you don't even need this
line.

[xidachen, 2016/08/26 02:21:39]

Done.

+  paint.setAlpha(0xFF);

[Justin Novosad, 2016/08/25 19:18:19]

This is a no-op. 0xFF is the default

[xidachen, 2016/08/26 02:21:39]

Done.

+  paint.setFilterQuality(kLow_SkFilterQuality);

[Justin Novosad, 2016/08/25 19:18:19]

This is also a no-op

[xidachen, 2016/08/26 02:21:39]

I believe the default filter quality is kNone.

+  renderer_.Paint(nullptr, canvas, kNaturalRect, &paint, VIDEO_ROTATION_0,
+                  Context3D());
 }
 
 void SkCanvasVideoRendererTest::Paint(
@@ -238,7 +242,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);
+  paint.setFilterQuality(kLow_SkFilterQuality);
+  renderer_.Paint(video_frame, canvas, dest_rect, &paint, video_rotation,
                   Context3D());
 }
 
@@ -536,7 +544,11 @@ 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;
+  paint.setXfermodeMode(SkXfermode::kSrc_Mode);

[Justin Novosad, 2016/08/25 19:18:19]

You change this from SrcOver to Src. Accident?

[xidachen, 2016/08/26 02:21:39]

Done.

+  paint.setAlpha(0xFF);
+  paint.setFilterQuality(kLow_SkFilterQuality);

[Justin Novosad, 2016/08/25 19:18:19]

These setting are the defaults; You could just use a default SkPaint.

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