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

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.cpp

Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: expand comment Created 6 years, 4 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "config.h" 5 #include "config.h"
6 #include "web/WebMediaPlayerClientImpl.h" 6 #include "web/WebMediaPlayerClientImpl.h"
7 7
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "core/html/HTMLMediaElement.h" 9 #include "core/html/HTMLMediaElement.h"
10 #include "core/html/TimeRanges.h" 10 #include "core/html/TimeRanges.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 #if ENABLE(WEB_AUDIO) 200 #if ENABLE(WEB_AUDIO)
201 // Make sure if we create/re-create the WebMediaPlayer that we update our wr apper. 201 // Make sure if we create/re-create the WebMediaPlayer that we update our wr apper.
202 m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider()); 202 m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
203 #endif 203 #endif
204 204
205 m_webMediaPlayer->setVolume(mediaElement().effectiveMediaVolume()); 205 m_webMediaPlayer->setVolume(mediaElement().effectiveMediaVolume());
206 206
207 m_webMediaPlayer->setPoster(poster); 207 m_webMediaPlayer->setPoster(poster);
208 208
209 // Tell WebMediaPlayer about any connected CDM (may be null). 209 // Tell WebMediaPlayer about any connected CDM (may be null).
210 m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia: :contentDecryptionModule(mediaElement())); 210 m_webMediaPlayer->setContentDecryptionModuleSync(HTMLMediaElementEncryptedMe dia::contentDecryptionModule(mediaElement()));
jamesr 2014/08/15 00:56:43 why does this call have to be synchronous? will th
jrummell 2014/08/15 18:32:06 The current HTML standard for resource fetching is
211 m_webMediaPlayer->load(loadType, kurl, corsMode); 211 m_webMediaPlayer->load(loadType, kurl, corsMode);
212 } 212 }
213 213
214 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload) 214 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload)
215 { 215 {
216 if (m_webMediaPlayer) 216 if (m_webMediaPlayer)
217 m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preloa d)); 217 m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preloa d));
218 } 218 }
219 219
220 #if ENABLE(WEB_AUDIO) 220 #if ENABLE(WEB_AUDIO)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 } 294 }
295 295
296 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor) 296 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor)
297 { 297 {
298 visitor->trace(m_client); 298 visitor->trace(m_client);
299 } 299 }
300 300
301 #endif 301 #endif
302 302
303 } // namespace blink 303 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698