Make HTMLMediaElement.setMediaKeys() asynchronous.

Source/web/WebMediaPlayerClientImpl.cpp

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/WebMediaPlayerClientImpl.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/TimeRanges.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
 #include "modules/encryptedmedia/MediaKeyNeededEvent.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
+#include "platform/ContentDecryptionModuleResult.h"

[ddorwin, 2014/08/08 02:50:52]

not needed

[jrummell, 2014/08/08 23:15:13]

Done.

 #include "platform/audio/AudioBus.h"
 #include "platform/audio/AudioSourceProviderClient.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/gpu/Extensions3DUtil.h"
 #include "platform/graphics/skia/GaneshUtils.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebAudioSourceProvider.h"
 #include "public/platform/WebCString.h"
@@ skipping 184 matching lines @@
 #if ENABLE(WEB_AUDIO)
     // Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
     m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
 #endif
 
     m_webMediaPlayer->setVolume(mediaElement().playerVolume());
 
     m_webMediaPlayer->setPoster(poster);
 
     // Tell WebMediaPlayer about any connected CDM (may be null).
-    m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));
+    m_webMediaPlayer->setContentDecryptionModuleSync(HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));
     m_webMediaPlayer->load(loadType, kurl, corsMode);
 }
 
 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload)
 {
     m_preload = preload;
 
     if (m_webMediaPlayer)
         m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preload));
 }
@@ skipping 76 matching lines @@
 }
 
 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor)
 {
     visitor->trace(m_client);
 }
 
 #endif
 
 } // namespace blink