| Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| index 881f8a6cdca7e919a6e2e4a24d4de3fa5b5a6bd8..48d408af325b1a4487c2c3a473072918365d8125 100644
|
| --- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
|
| @@ -75,6 +75,7 @@
|
| #include "platform/plugins/PluginData.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebApplicationCacheHost.h"
|
| +#include "public/platform/WebMediaElementSource.h"
|
| #include "public/platform/WebMimeRegistry.h"
|
| #include "public/platform/WebRTCPeerConnectionHandler.h"
|
| #include "public/platform/WebSecurityOrigin.h"
|
| @@ -822,7 +823,7 @@ RawPtr<Widget> FrameLoaderClientImpl::createPlugin(
|
|
|
| PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
|
| HTMLMediaElement& htmlMediaElement,
|
| - const WebURL& url,
|
| + const WebMediaElementSource& source,
|
| WebMediaPlayerClient* client)
|
| {
|
| WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(
|
| @@ -837,7 +838,8 @@ PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
|
|
|
| HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMedia::from(htmlMediaElement);
|
| WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement));
|
| - return adoptPtr(webFrame->client()->createMediaPlayer(url, client, &encryptedMedia,
|
| + return adoptPtr(webFrame->client()->createMediaPlayer(source,
|
| + client, &encryptedMedia,
|
| encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession));
|
| }
|
|
|
|
|