Chromium Code Reviews| Index: Source/web/FrameLoaderClientImpl.cpp |
| diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp |
| index de7477a1b67df0f1c78c043831deec2f50f5bd7a..50a56f405c6a7f2c0f73966702793386df01fbf0 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/input/EventHandler.h" |
| #include "core/layout/HitTestResult.h" |
| #include "core/loader/DocumentLoader.h" |
| @@ -53,6 +54,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" |
| @@ -778,6 +780,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), |
|
philipj_slow
2015/07/01 13:49:19
It compiles for me without this cast, but I guess
Srirama
2015/07/03 12:59:02
Done. I would have added it in my initial stages o
|
| + &encryptedMedia, encryptedMedia.contentDecryptionModule())); |
| +} |
| + |
| ObjectContentType FrameLoaderClientImpl::objectContentType( |
| const KURL& url, |
| const String& explicitMimeType, |