| Index: Source/web/FrameLoaderClientImpl.cpp
|
| diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp
|
| index 41c480dff383517257a9956851ff045272fc52f4..1b63873c50499c8887eefc0c8fe383675bdff2dc 100644
|
| --- a/Source/web/FrameLoaderClientImpl.cpp
|
| +++ b/Source/web/FrameLoaderClientImpl.cpp
|
| @@ -42,6 +42,7 @@
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/html/HTMLAppletElement.h"
|
| +#include "core/html/HTMLMediaElement.h"
|
| #include "core/layout/HitTestResult.h"
|
| #include "core/loader/DocumentLoader.h"
|
| #include "core/loader/FrameLoadRequest.h"
|
| @@ -54,6 +55,7 @@
|
| #include "modules/device_light/DeviceLightController.h"
|
| #include "modules/device_orientation/DeviceMotionController.h"
|
| #include "modules/device_orientation/DeviceOrientationController.h"
|
| +#include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
|
| #include "modules/gamepad/NavigatorGamepad.h"
|
| #include "modules/serviceworkers/NavigatorServiceWorker.h"
|
| #include "modules/storage/DOMWindowStorageController.h"
|
| @@ -67,6 +69,7 @@
|
| #include "platform/plugins/PluginData.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebApplicationCacheHost.h"
|
| +#include "public/platform/WebMediaPlayer.h"
|
| #include "public/platform/WebMimeRegistry.h"
|
| #include "public/platform/WebRTCPeerConnectionHandler.h"
|
| #include "public/platform/WebSecurityOrigin.h"
|
| @@ -779,6 +782,22 @@ PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget(
|
| "application/x-java-applet", false, FailOnDetachedPlugin);
|
| }
|
|
|
| +PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
|
| + HTMLMediaElement* htmlMediaElement,
|
| + const WebURL& url)
|
| +{
|
| + WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(
|
| + htmlMediaElement->document().frame());
|
| +
|
| + if (!webFrame || !webFrame->client())
|
| + return nullptr;
|
| +
|
| + HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMedia::from(*htmlMediaElement);
|
| + return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url,
|
| + static_cast<WebMediaPlayerClient*>(htmlMediaElement),
|
| + &encryptedMedia, encryptedMedia.contentDecryptionModule()));
|
| +}
|
| +
|
| ObjectContentType FrameLoaderClientImpl::objectContentType(
|
| const KURL& url,
|
| const String& explicitMimeType,
|
|
|