| Index: Source/web/FrameLoaderClientImpl.cpp
|
| diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp
|
| index 3bb5bc95fb8667696f0288f74174ea952da54b66..8885c1bea329eddb6bb9b0024a2d5bef414fb7cf 100644
|
| --- a/Source/web/FrameLoaderClientImpl.cpp
|
| +++ b/Source/web/FrameLoaderClientImpl.cpp
|
| @@ -780,19 +780,20 @@ PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget(
|
| }
|
|
|
| PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
|
| - HTMLMediaElement* htmlMediaElement,
|
| - const WebURL& url)
|
| + HTMLMediaElement& htmlMediaElement,
|
| + const WebURL& url,
|
| + WebMediaPlayerClient* client)
|
| {
|
| WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(
|
| - htmlMediaElement->document().frame());
|
| + htmlMediaElement.document().frame());
|
|
|
| if (!webFrame || !webFrame->client())
|
| return nullptr;
|
|
|
| - HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMedia::from(*htmlMediaElement);
|
| + HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMedia::from(htmlMediaElement);
|
| return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url,
|
| - htmlMediaElement,
|
| - &encryptedMedia, encryptedMedia.contentDecryptionModule()));
|
| + client, &encryptedMedia,
|
| + encryptedMedia.contentDecryptionModule()));
|
| }
|
|
|
| ObjectContentType FrameLoaderClientImpl::objectContentType(
|
|
|