Canvas: composite video on canvas correctly.

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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebMediaPlayer_h
 #define WebMediaPlayer_h
 
 #include "WebCanvas.h"
 #include "WebMediaSource.h"
 #include "WebString.h"
 #include "WebTimeRange.h"
+#include "third_party/skia/include/core/SkXfermode.h"
 
 namespace blink {
 
 class WebAudioSourceProvider;
 class WebAudioSourceProviderClient;
 class WebContentDecryptionModule;
 class WebMediaPlayerClient;
 class WebString;
 class WebURL;
 struct WebRect;
@@ skipping 57 matching lines @@
     virtual void play() = 0;
     virtual void pause() = 0;
     virtual bool supportsSave() const = 0;
     virtual void seek(double seconds) = 0;
     virtual void setRate(double) = 0;
     virtual void setVolume(double) = 0;
     virtual void setPreload(Preload) { };
     virtual WebTimeRanges buffered() const = 0;
     virtual double maxTimeSeekable() const = 0;
 
-    virtual void paint(WebCanvas*, const WebRect&, unsigned char alpha) = 0;
-
     // True if the loaded media has a playable video/audio track.
     virtual bool hasVideo() const = 0;
     virtual bool hasAudio() const = 0;
 
     // Dimension of the video.
     virtual WebSize naturalSize() const = 0;
 
     // Getters of playback state.
     virtual bool paused() const = 0;
     virtual bool seeking() const = 0;
@@ skipping 10 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 unsigned audioDecodedByteCount() const = 0;
     virtual unsigned videoDecodedByteCount() const = 0;
 
+    virtual void paint(WebCanvas*, const WebRect&, unsigned char alpha, SkXfermode::Mode) = 0;
     // Do a GPU-GPU textures copy if possible.
     virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, unsigned texture, unsigned level, unsigned internalFormat, unsigned type, bool premultiplyAlpha, bool flipY) { return false; }
 
     virtual WebAudioSourceProvider* audioSourceProvider() { return 0; }
 
     // Returns whether keySystem is supported. If true, the result will be
     // reported by an event.
     virtual MediaKeyException generateKeyRequest(const WebString& keySystem, const unsigned char* initData, unsigned initDataLength) { return MediaKeyExceptionKeySystemNotSupported; }
     virtual MediaKeyException addKey(const WebString& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
     virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
     virtual void setContentDecryptionModule(WebContentDecryptionModule* cdm) { }
 
     // Sets the poster image URL.
     virtual void setPoster(const WebURL& poster) { }
 
     // Instruct WebMediaPlayer to enter/exit fullscreen.
     virtual void enterFullscreen() { }
     // Returns true if the player can enter fullscreen.
     virtual bool canEnterFullscreen() const { return false; }
 
     virtual void enabledAudioTracksChanged(const WebVector<TrackId>& enabledTrackIds) { }
     // |selectedTrackId| is null if no track is selected.
     virtual void selectedVideoTrackChanged(TrackId* selectedTrackId) { }
 };
 
 } // namespace blink
 
 #endif