OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 24 matching lines...) Expand all Loading... | |
35 #include "bindings/core/v8/ScriptController.h" | 35 #include "bindings/core/v8/ScriptController.h" |
36 #include "core/HTMLNames.h" | 36 #include "core/HTMLNames.h" |
37 #include "core/dom/Document.h" | 37 #include "core/dom/Document.h" |
38 #include "core/dom/Fullscreen.h" | 38 #include "core/dom/Fullscreen.h" |
39 #include "core/events/MessageEvent.h" | 39 #include "core/events/MessageEvent.h" |
40 #include "core/events/MouseEvent.h" | 40 #include "core/events/MouseEvent.h" |
41 #include "core/events/UIEventWithKeyState.h" | 41 #include "core/events/UIEventWithKeyState.h" |
42 #include "core/frame/FrameView.h" | 42 #include "core/frame/FrameView.h" |
43 #include "core/frame/Settings.h" | 43 #include "core/frame/Settings.h" |
44 #include "core/html/HTMLAppletElement.h" | 44 #include "core/html/HTMLAppletElement.h" |
45 #include "core/html/HTMLMediaElement.h" | |
45 #include "core/layout/HitTestResult.h" | 46 #include "core/layout/HitTestResult.h" |
46 #include "core/loader/DocumentLoader.h" | 47 #include "core/loader/DocumentLoader.h" |
47 #include "core/loader/FrameLoadRequest.h" | 48 #include "core/loader/FrameLoadRequest.h" |
48 #include "core/loader/FrameLoader.h" | 49 #include "core/loader/FrameLoader.h" |
49 #include "core/loader/HistoryItem.h" | 50 #include "core/loader/HistoryItem.h" |
50 #include "core/page/Chrome.h" | 51 #include "core/page/Chrome.h" |
51 #include "core/page/EventHandler.h" | 52 #include "core/page/EventHandler.h" |
52 #include "core/page/Page.h" | 53 #include "core/page/Page.h" |
53 #include "core/page/WindowFeatures.h" | 54 #include "core/page/WindowFeatures.h" |
54 #include "modules/device_light/DeviceLightController.h" | 55 #include "modules/device_light/DeviceLightController.h" |
55 #include "modules/device_orientation/DeviceMotionController.h" | 56 #include "modules/device_orientation/DeviceMotionController.h" |
56 #include "modules/device_orientation/DeviceOrientationController.h" | 57 #include "modules/device_orientation/DeviceOrientationController.h" |
58 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" | |
57 #include "modules/gamepad/NavigatorGamepad.h" | 59 #include "modules/gamepad/NavigatorGamepad.h" |
58 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 60 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
59 #include "modules/storage/DOMWindowStorageController.h" | 61 #include "modules/storage/DOMWindowStorageController.h" |
60 #include "modules/vr/NavigatorVRDevice.h" | 62 #include "modules/vr/NavigatorVRDevice.h" |
61 #include "platform/MIMETypeRegistry.h" | 63 #include "platform/MIMETypeRegistry.h" |
62 #include "platform/RuntimeEnabledFeatures.h" | 64 #include "platform/RuntimeEnabledFeatures.h" |
63 #include "platform/UserGestureIndicator.h" | 65 #include "platform/UserGestureIndicator.h" |
64 #include "platform/exported/WrappedResourceRequest.h" | 66 #include "platform/exported/WrappedResourceRequest.h" |
65 #include "platform/exported/WrappedResourceResponse.h" | 67 #include "platform/exported/WrappedResourceResponse.h" |
66 #include "platform/network/HTTPParsers.h" | 68 #include "platform/network/HTTPParsers.h" |
67 #include "platform/plugins/PluginData.h" | 69 #include "platform/plugins/PluginData.h" |
68 #include "public/platform/Platform.h" | 70 #include "public/platform/Platform.h" |
69 #include "public/platform/WebApplicationCacheHost.h" | 71 #include "public/platform/WebApplicationCacheHost.h" |
72 #include "public/platform/WebMediaPlayer.h" | |
70 #include "public/platform/WebMimeRegistry.h" | 73 #include "public/platform/WebMimeRegistry.h" |
71 #include "public/platform/WebRTCPeerConnectionHandler.h" | 74 #include "public/platform/WebRTCPeerConnectionHandler.h" |
72 #include "public/platform/WebServiceWorkerProvider.h" | 75 #include "public/platform/WebServiceWorkerProvider.h" |
73 #include "public/platform/WebServiceWorkerProviderClient.h" | 76 #include "public/platform/WebServiceWorkerProviderClient.h" |
74 #include "public/platform/WebURL.h" | 77 #include "public/platform/WebURL.h" |
75 #include "public/platform/WebURLError.h" | 78 #include "public/platform/WebURLError.h" |
76 #include "public/platform/WebVector.h" | 79 #include "public/platform/WebVector.h" |
77 #include "public/web/WebAutofillClient.h" | 80 #include "public/web/WebAutofillClient.h" |
78 #include "public/web/WebCachedURLRequest.h" | 81 #include "public/web/WebCachedURLRequest.h" |
79 #include "public/web/WebContentSettingsClient.h" | 82 #include "public/web/WebContentSettingsClient.h" |
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
781 PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget( | 784 PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget( |
782 HTMLAppletElement* element, | 785 HTMLAppletElement* element, |
783 const KURL& /* baseURL */, | 786 const KURL& /* baseURL */, |
784 const Vector<String>& paramNames, | 787 const Vector<String>& paramNames, |
785 const Vector<String>& paramValues) | 788 const Vector<String>& paramValues) |
786 { | 789 { |
787 return createPlugin(element, KURL(), paramNames, paramValues, | 790 return createPlugin(element, KURL(), paramNames, paramValues, |
788 "application/x-java-applet", false, FailOnDetachedPlugin); | 791 "application/x-java-applet", false, FailOnDetachedPlugin); |
789 } | 792 } |
790 | 793 |
794 PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer( | |
795 HTMLMediaElement* htmlMediaElement, | |
796 const WebURL& url) | |
797 { | |
798 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame( | |
799 htmlMediaElement->document().frame()); | |
800 | |
801 if (!webFrame || !webFrame->client()) | |
802 return nullptr; | |
803 return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url, static_ cast<WebMediaPlayerClient*>(htmlMediaElement), | |
ddorwin
2015/05/08 17:49:42
nit: Put this complex last parameter on its own li
Srirama
2015/05/19 10:39:47
Done.
| |
804 &(HTMLMediaElementEncryptedMedia::from(*htmlMediaElement)), | |
805 HTMLMediaElementEncryptedMedia::contentDecryptionModule(*htmlMediaElemen t))); | |
ddorwin
2015/05/08 17:49:42
As noted at the definition, I think it makes sense
Srirama
2015/05/19 10:39:47
Done.
| |
806 } | |
807 | |
791 ObjectContentType FrameLoaderClientImpl::objectContentType( | 808 ObjectContentType FrameLoaderClientImpl::objectContentType( |
792 const KURL& url, | 809 const KURL& url, |
793 const String& explicitMimeType, | 810 const String& explicitMimeType, |
794 bool shouldPreferPlugInsForImages) | 811 bool shouldPreferPlugInsForImages) |
795 { | 812 { |
796 // This code is based on Apple's implementation from | 813 // This code is based on Apple's implementation from |
797 // WebCoreSupport/WebFrameBridge.mm. | 814 // WebCoreSupport/WebFrameBridge.mm. |
798 | 815 |
799 String mimeType = explicitMimeType; | 816 String mimeType = explicitMimeType; |
800 if (mimeType.isEmpty()) { | 817 if (mimeType.isEmpty()) { |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
964 | 981 |
965 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) | 982 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) |
966 { | 983 { |
967 if (m_webFrame->client()) { | 984 if (m_webFrame->client()) { |
968 m_webFrame->client()->suddenTerminationDisablerChanged( | 985 m_webFrame->client()->suddenTerminationDisablerChanged( |
969 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); | 986 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); |
970 } | 987 } |
971 } | 988 } |
972 | 989 |
973 } // namespace blink | 990 } // namespace blink |
OLD | NEW |