diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 18:44:49 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 18:44:49 +0000 |
| commit | a7c4f5879c891938db70fa274eecadcf760d2b9b (patch) | |
| tree | 023a15647255d15b5305e0d1c1f2d8868cf05a8e /content/renderer/media | |
| parent | 9475ac9e09e70a2b18b40faa66b3a49bec3ef77b (diff) | |
| download | chromium_src-a7c4f5879c891938db70fa274eecadcf760d2b9b.zip chromium_src-a7c4f5879c891938db70fa274eecadcf760d2b9b.tar.gz chromium_src-a7c4f5879c891938db70fa274eecadcf760d2b9b.tar.bz2 | |
Remove calls to WebMediaPlayerClient::setOpaque().
As of blink r171720 they're no longer needed now that WebMediaPlayer implementations call WebLayerImpl::setOpaque() directly.
BUG=110814
Review URL: https://codereview.chromium.org/239393007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
| -rw-r--r-- | content/renderer/media/webmediaplayer_impl.cc | 7 | ||||
| -rw-r--r-- | content/renderer/media/webmediaplayer_ms.cc | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc index e81de2e..e54b162 100644 --- a/content/renderer/media/webmediaplayer_impl.cc +++ b/content/renderer/media/webmediaplayer_impl.cc @@ -992,11 +992,8 @@ void WebMediaPlayerImpl::OnPipelineMetadata( DCHECK(!video_weblayer_); video_weblayer_.reset(new webkit::WebLayerImpl( cc::VideoLayer::Create(compositor_.GetVideoFrameProvider()))); - - client_->setWebLayer(video_weblayer_.get()); - // TODO(scherkus): Remove once plumbing from HTMLMediaElement is removed. - client_->setOpaque(opaque_); video_weblayer_->setOpaque(opaque_); + client_->setWebLayer(video_weblayer_.get()); } // TODO(scherkus): This should be handled by HTMLMediaElement and controls @@ -1305,8 +1302,6 @@ void WebMediaPlayerImpl::OnOpacityChanged(bool opaque) { DCHECK_NE(ready_state_, WebMediaPlayer::ReadyStateHaveNothing); opaque_ = opaque; - // TODO(scherkus): Remove once plumbing from HTMLMediaElement is removed. - client_->setOpaque(opaque); if (video_weblayer_) video_weblayer_->setOpaque(opaque_); } diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index d4d4d4a..f2a3e70 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -152,8 +152,6 @@ void WebMediaPlayerMS::load(LoadType load_type, RenderFrame::FromWebFrame(frame_)->GetRoutingID()); if (video_frame_provider_.get() || audio_renderer_.get()) { - // TODO(scherkus): Remove once plumbing from HTMLMediaElement is removed. - GetClient()->setOpaque(true); if (audio_renderer_.get()) audio_renderer_->Start(); |