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

third_party/WebKit/public/platform/WebMediaPlayer.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #ifndef WebMediaPlayer_h
 #define WebMediaPlayer_h
 
 #include "WebCallbacks.h"
 #include "WebCanvas.h"
 #include "WebContentDecryptionModule.h"
 #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 {
 class GLES2Interface;
 }
 }
 
 namespace blink {
 
 class WebAudioSourceProvider;
@@ skipping 108 matching lines @@
     virtual bool didPassCORSAccessCheck() const = 0;
 
     virtual double mediaTimeForTimeValue(double timeValue) const = 0;
 
     virtual unsigned decodedFrameCount() const = 0;
     virtual unsigned droppedFrameCount() const = 0;
     virtual unsigned corruptedFrameCount() const { return 0; }
     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; }
 
     // Do a GPU-GPU textures copy. If the copy is impossible or fails, it returns false.
     virtual bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*, unsigned target,
         unsigned texture, unsigned internalFormat, unsigned type, int level,
         bool premultiplyAlpha, bool flipY) { return false; }
     // Copy sub video frame texture to |texture|. If the copy is impossible or fails, it returns false.
     virtual bool copyVideoSubTextureToPlatformTexture(gpu::gles2::GLES2Interface*, unsigned target,
@@ skipping 17 matching lines @@
     virtual void exitedFullscreen() { }
 
     virtual void enabledAudioTracksChanged(const WebVector<TrackId>& enabledTrackIds) { }
     // |selectedTrackId| is null if no track is selected.
     virtual void selectedVideoTrackChanged(TrackId* selectedTrackId) { }
 };
 
 } // namespace blink
 
 #endif