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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 #include "platform/MIMETypeRegistry.h" | 68 #include "platform/MIMETypeRegistry.h" |
69 #include "platform/RuntimeEnabledFeatures.h" | 69 #include "platform/RuntimeEnabledFeatures.h" |
70 #include "platform/UserGestureIndicator.h" | 70 #include "platform/UserGestureIndicator.h" |
71 #include "platform/exported/WrappedResourceRequest.h" | 71 #include "platform/exported/WrappedResourceRequest.h" |
72 #include "platform/exported/WrappedResourceResponse.h" | 72 #include "platform/exported/WrappedResourceResponse.h" |
73 #include "platform/fonts/GlyphPageTreeNode.h" | 73 #include "platform/fonts/GlyphPageTreeNode.h" |
74 #include "platform/network/HTTPParsers.h" | 74 #include "platform/network/HTTPParsers.h" |
75 #include "platform/plugins/PluginData.h" | 75 #include "platform/plugins/PluginData.h" |
76 #include "public/platform/Platform.h" | 76 #include "public/platform/Platform.h" |
77 #include "public/platform/WebApplicationCacheHost.h" | 77 #include "public/platform/WebApplicationCacheHost.h" |
| 78 #include "public/platform/WebMediaPlayerSource.h" |
78 #include "public/platform/WebMimeRegistry.h" | 79 #include "public/platform/WebMimeRegistry.h" |
79 #include "public/platform/WebRTCPeerConnectionHandler.h" | 80 #include "public/platform/WebRTCPeerConnectionHandler.h" |
80 #include "public/platform/WebSecurityOrigin.h" | 81 #include "public/platform/WebSecurityOrigin.h" |
81 #include "public/platform/WebURL.h" | 82 #include "public/platform/WebURL.h" |
82 #include "public/platform/WebURLError.h" | 83 #include "public/platform/WebURLError.h" |
83 #include "public/platform/WebVector.h" | 84 #include "public/platform/WebVector.h" |
84 #include "public/platform/modules/mediasession/WebMediaSession.h" | 85 #include "public/platform/modules/mediasession/WebMediaSession.h" |
85 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h" | 86 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h" |
86 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h
" | 87 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h
" |
87 #include "public/web/WebAutofillClient.h" | 88 #include "public/web/WebAutofillClient.h" |
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
815 return nullptr; | 816 return nullptr; |
816 | 817 |
817 if (policy != AllowDetachedPlugin && !element->layoutObject()) | 818 if (policy != AllowDetachedPlugin && !element->layoutObject()) |
818 return nullptr; | 819 return nullptr; |
819 | 820 |
820 return container; | 821 return container; |
821 } | 822 } |
822 | 823 |
823 PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer( | 824 PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer( |
824 HTMLMediaElement& htmlMediaElement, | 825 HTMLMediaElement& htmlMediaElement, |
825 const WebURL& url, | 826 const WebMediaPlayerSource& source, |
826 WebMediaPlayerClient* client) | 827 WebMediaPlayerClient* client) |
827 { | 828 { |
828 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame( | 829 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame( |
829 htmlMediaElement.document().frame()); | 830 htmlMediaElement.document().frame()); |
830 | 831 |
831 if (!webFrame || !webFrame->client()) | 832 if (!webFrame || !webFrame->client()) |
832 return nullptr; | 833 return nullptr; |
833 | 834 |
834 WebMediaSession* webMediaSession = nullptr; | 835 WebMediaSession* webMediaSession = nullptr; |
835 if (MediaSession* mediaSession = HTMLMediaElementMediaSession::session(htmlM
ediaElement)) | 836 if (MediaSession* mediaSession = HTMLMediaElementMediaSession::session(htmlM
ediaElement)) |
836 webMediaSession = mediaSession->getWebMediaSession(); | 837 webMediaSession = mediaSession->getWebMediaSession(); |
837 | 838 |
838 HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMe
dia::from(htmlMediaElement); | 839 HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMe
dia::from(htmlMediaElement); |
839 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)
); | 840 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)
); |
840 return adoptPtr(webFrame->client()->createMediaPlayer(url, client, &encrypte
dMedia, | 841 return adoptPtr(webFrame->client()->createMediaPlayer(source, |
| 842 client, &encryptedMedia, |
841 encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession)); | 843 encryptedMedia.contentDecryptionModule(), sinkId, webMediaSession)); |
842 } | 844 } |
843 | 845 |
844 PassOwnPtr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession() | 846 PassOwnPtr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession() |
845 { | 847 { |
846 if (!m_webFrame->client()) | 848 if (!m_webFrame->client()) |
847 return nullptr; | 849 return nullptr; |
848 | 850 |
849 return adoptPtr(m_webFrame->client()->createMediaSession()); | 851 return adoptPtr(m_webFrame->client()->createMediaSession()); |
850 } | 852 } |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1057 return nullptr; | 1059 return nullptr; |
1058 return m_webFrame->client()->frameBlameContext(); | 1060 return m_webFrame->client()->frameBlameContext(); |
1059 } | 1061 } |
1060 | 1062 |
1061 LinkResource* FrameLoaderClientImpl::createServiceWorkerLinkResource(HTMLLinkEle
ment* owner) | 1063 LinkResource* FrameLoaderClientImpl::createServiceWorkerLinkResource(HTMLLinkEle
ment* owner) |
1062 { | 1064 { |
1063 return ServiceWorkerLinkResource::create(owner); | 1065 return ServiceWorkerLinkResource::create(owner); |
1064 } | 1066 } |
1065 | 1067 |
1066 } // namespace blink | 1068 } // namespace blink |
OLD | NEW |