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

media/renderers/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 <stdint.h>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface_stub.h"
@@ skipping 188 matching lines @@
                    cropped_frame()->stride(VideoFrame::kYPlane),
                    cropped_frame()->data(VideoFrame::kUPlane),
                    cropped_frame()->stride(VideoFrame::kUPlane),
                    cropped_frame()->data(VideoFrame::kVPlane),
                    cropped_frame()->stride(VideoFrame::kVPlane), 16, 16);
 }
 
 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(
     const scoped_refptr<VideoFrame>& video_frame,
     SkCanvas* canvas,
     Color color) {
   PaintRotated(video_frame, canvas, kNaturalRect, color,
                SkXfermode::kSrcOver_Mode, VIDEO_ROTATION_0);
 }
 
@@ skipping 10 matching lines @@
     case kRed:
       media::FillYUV(video_frame.get(), 76, 84, 255);
       break;
     case kGreen:
       media::FillYUV(video_frame.get(), 149, 43, 21);
       break;
     case kBlue:
       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());
 }
 
 void SkCanvasVideoRendererTest::Copy(
     const scoped_refptr<VideoFrame>& video_frame,
     SkCanvas* canvas) {
   renderer_.Copy(video_frame, canvas, Context3D());
 }
 
 TEST_F(SkCanvasVideoRendererTest, NoFrame) {
@@ skipping 277 matching lines @@
 
   TestGLES2Interface gles2;
   Context3D context_3d(&gles2, gr_context.get());
   gfx::Size size(kWidth, kHeight);
   gpu::MailboxHolder holders[VideoFrame::kMaxPlanes] = {gpu::MailboxHolder(
       gpu::Mailbox::Generate(), gpu::SyncToken(), GL_TEXTURE_RECTANGLE_ARB)};
   auto video_frame = VideoFrame::WrapNativeTextures(
       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