Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1005)

Side by Side Diff: webkit/renderer/media/webmediaplayer_impl.cc

Issue 17309003: Removed unused NeedKey callback from Decryptors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/renderer/media/crypto/proxy_decryptor.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/renderer/media/webmediaplayer_impl.h" 5 #include "webkit/renderer/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 169
170 // Also we want to be notified of |main_loop_| destruction. 170 // Also we want to be notified of |main_loop_| destruction.
171 base::MessageLoop::current()->AddDestructionObserver(this); 171 base::MessageLoop::current()->AddDestructionObserver(this);
172 172
173 if (WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) { 173 if (WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) {
174 decryptor_.reset(new ProxyDecryptor( 174 decryptor_.reset(new ProxyDecryptor(
175 client, 175 client,
176 frame, 176 frame,
177 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded), 177 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded),
178 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError), 178 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError),
179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage), 179 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyMessage)));
180 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNeedKey)));
181 } 180 }
182 181
183 // Use the null sink if no sink was provided. 182 // Use the null sink if no sink was provided.
184 audio_source_provider_ = new WebAudioSourceProviderImpl( 183 audio_source_provider_ = new WebAudioSourceProviderImpl(
185 params.audio_renderer_sink().get() 184 params.audio_renderer_sink().get()
186 ? params.audio_renderer_sink() 185 ? params.audio_renderer_sink()
187 : new media::NullAudioSink(media_loop_)); 186 : new media::NullAudioSink(media_loop_));
188 } 187 }
189 188
190 WebMediaPlayerImpl::~WebMediaPlayerImpl() { 189 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 1199
1201 if (pending_repaint_) 1200 if (pending_repaint_)
1202 return; 1201 return;
1203 1202
1204 pending_repaint_ = true; 1203 pending_repaint_ = true;
1205 main_loop_->PostTask(FROM_HERE, base::Bind( 1204 main_loop_->PostTask(FROM_HERE, base::Bind(
1206 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); 1205 &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
1207 } 1206 }
1208 1207
1209 } // namespace webkit_media 1208 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/renderer/media/crypto/proxy_decryptor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698