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

third_party/WebKit/public/platform/WebMediaPlayer.h

Index: third_party/WebKit/public/platform/WebMediaPlayer.h
diff --git a/third_party/WebKit/public/platform/WebMediaPlayer.h b/third_party/WebKit/public/platform/WebMediaPlayer.h
index 9979e856dae347c8f0d7c1aa103727dd3751640c..b7defadade0be9d99b1401f5bd4ec3910602576e 100644
--- a/third_party/WebKit/public/platform/WebMediaPlayer.h
+++ b/third_party/WebKit/public/platform/WebMediaPlayer.h
@@ -37,8 +37,7 @@
 #include "WebMediaSource.h"
 #include "WebSetSinkIdCallbacks.h"
 #include "WebString.h"
-#include "WebTimeRange.h"
-#include "third_party/skia/include/core/SkXfermode.h"
+#include "third_party/skia/include/core/SkPaint.h"

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

No need to include.  Just forward-declare.

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

Done.

 
 namespace gpu {
 namespace gles2 {
@@ -167,7 +166,7 @@ public:
     virtual size_t audioDecodedByteCount() const = 0;
     virtual size_t videoDecodedByteCount() const = 0;
 
-    virtual void paint(WebCanvas*, const WebRect&, unsigned char alpha, SkXfermode::Mode) = 0;
+    virtual void paint(WebCanvas*, const WebRect&, const SkPaint*) = 0;
 
     // TODO(dshwang): remove non-|target| version. crbug.com/349871
     virtual bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*, unsigned texture, unsigned internalFormat, unsigned type, bool premultiplyAlpha, bool flipY) { return false; }