diff options
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.cc | 6 | ||||
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.h | 4 | ||||
| -rw-r--r-- | content/renderer/media/webmediaplayer_ms.cc | 6 | ||||
| -rw-r--r-- | content/renderer/media/webmediaplayer_ms.h | 4 | ||||
| -rw-r--r-- | media/blink/webmediaplayer_impl.cc | 6 | ||||
| -rw-r--r-- | media/blink/webmediaplayer_impl.h | 4 |
6 files changed, 0 insertions, 30 deletions
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index e2b9e7e..23fc995 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -576,12 +576,6 @@ bool WebMediaPlayerAndroid::EnsureTextureBackedSkBitmap(GrContext* gr, void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas, const blink::WebRect& rect, - unsigned char alpha) { - paint(canvas, rect, alpha, SkXfermode::kSrcOver_Mode); -} - -void WebMediaPlayerAndroid::paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, unsigned char alpha, SkXfermode::Mode mode) { DCHECK(main_thread_checker_.CalledOnValidThread()); diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index c06eac0..83db690 100644 --- a/content/renderer/media/android/webmediaplayer_android.h +++ b/content/renderer/media/android/webmediaplayer_android.h @@ -126,10 +126,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, const blink::WebRect& rect, unsigned char alpha, SkXfermode::Mode mode); - // TODO(dshwang): remove it because above method replaces. crbug.com/401027 - virtual void paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, - unsigned char alpha); virtual bool copyVideoTextureToPlatformTexture( blink::WebGraphicsContext3D* web_graphics_context, diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index cc7f337..83f082a 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -321,12 +321,6 @@ bool WebMediaPlayerMS::didLoadingProgress() { void WebMediaPlayerMS::paint(blink::WebCanvas* canvas, const blink::WebRect& rect, - unsigned char alpha) { - paint(canvas, rect, alpha, SkXfermode::kSrcOver_Mode); -} - -void WebMediaPlayerMS::paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, unsigned char alpha, SkXfermode::Mode mode) { DVLOG(3) << "WebMediaPlayerMS::paint"; diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index d469ef8..d67f7b7 100644 --- a/content/renderer/media/webmediaplayer_ms.h +++ b/content/renderer/media/webmediaplayer_ms.h @@ -83,10 +83,6 @@ class WebMediaPlayerMS const blink::WebRect& rect, unsigned char alpha, SkXfermode::Mode mode); - // TODO(dshwang): remove it because above method replaces. crbug.com/401027 - virtual void paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, - unsigned char alpha); // True if the loaded media has a playable video/audio track. virtual bool hasVideo() const; diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc index ce5dc2d..24538c1 100644 --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc @@ -509,12 +509,6 @@ bool WebMediaPlayerImpl::didLoadingProgress() { void WebMediaPlayerImpl::paint(blink::WebCanvas* canvas, const blink::WebRect& rect, - unsigned char alpha) { - paint(canvas, rect, alpha, SkXfermode::kSrcOver_Mode); -} - -void WebMediaPlayerImpl::paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, unsigned char alpha, SkXfermode::Mode mode) { DCHECK(main_task_runner_->BelongsToCurrentThread()); diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h index e875995..a237a40 100644 --- a/media/blink/webmediaplayer_impl.h +++ b/media/blink/webmediaplayer_impl.h @@ -90,10 +90,6 @@ class MEDIA_EXPORT WebMediaPlayerImpl const blink::WebRect& rect, unsigned char alpha, SkXfermode::Mode mode); - // TODO(dshwang): remove it because above method replaces. crbug.com/401027 - virtual void paint(blink::WebCanvas* canvas, - const blink::WebRect& rect, - unsigned char alpha); // True if the loaded media has a playable video/audio track. virtual bool hasVideo() const; |