diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index e2b9e7e9c53f..23fc99584b6e 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -574,12 +574,6 @@ bool WebMediaPlayerAndroid::EnsureTextureBackedSkBitmap(GrContext* gr, return true; } -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, diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h index c06eac05ee7d..83db690471d3 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 cc7f33737190..83f082ad07e4 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -319,12 +319,6 @@ bool WebMediaPlayerMS::didLoadingProgress() { return true; } -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, diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h index d469ef8d941f..d67f7b753fd7 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 ce5dc2d6dffd..24538c116409 100644 --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc @@ -507,12 +507,6 @@ bool WebMediaPlayerImpl::didLoadingProgress() { return pipeline_progress || data_progress; } -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, diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h index e87599505b94..a237a4038228 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;