| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include "core/loader/HistoryItem.h" | 51 #include "core/loader/HistoryItem.h" |
| 52 #include "core/page/Page.h" | 52 #include "core/page/Page.h" |
| 53 #include "core/page/WindowFeatures.h" | 53 #include "core/page/WindowFeatures.h" |
| 54 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" | 54 #include "modules/audio_output_devices/HTMLMediaElementAudioOutputDevice.h" |
| 55 #include "modules/device_light/DeviceLightController.h" | 55 #include "modules/device_light/DeviceLightController.h" |
| 56 #include "modules/device_orientation/DeviceMotionController.h" | 56 #include "modules/device_orientation/DeviceMotionController.h" |
| 57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" | 57 #include "modules/device_orientation/DeviceOrientationAbsoluteController.h" |
| 58 #include "modules/device_orientation/DeviceOrientationController.h" | 58 #include "modules/device_orientation/DeviceOrientationController.h" |
| 59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" | 59 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" |
| 60 #include "modules/gamepad/NavigatorGamepad.h" | 60 #include "modules/gamepad/NavigatorGamepad.h" |
| 61 #include "modules/mediasession/MediaSession.h" | |
| 62 #include "modules/serviceworkers/NavigatorServiceWorker.h" | 61 #include "modules/serviceworkers/NavigatorServiceWorker.h" |
| 63 #include "modules/serviceworkers/ServiceWorkerLinkResource.h" | 62 #include "modules/serviceworkers/ServiceWorkerLinkResource.h" |
| 64 #include "modules/storage/DOMWindowStorageController.h" | 63 #include "modules/storage/DOMWindowStorageController.h" |
| 65 #include "modules/vr/NavigatorVR.h" | 64 #include "modules/vr/NavigatorVR.h" |
| 66 #include "platform/Histogram.h" | 65 #include "platform/Histogram.h" |
| 67 #include "platform/MIMETypeRegistry.h" | 66 #include "platform/MIMETypeRegistry.h" |
| 68 #include "platform/RuntimeEnabledFeatures.h" | 67 #include "platform/RuntimeEnabledFeatures.h" |
| 69 #include "platform/UserGestureIndicator.h" | 68 #include "platform/UserGestureIndicator.h" |
| 70 #include "platform/exported/WrappedResourceRequest.h" | 69 #include "platform/exported/WrappedResourceRequest.h" |
| 71 #include "platform/exported/WrappedResourceResponse.h" | 70 #include "platform/exported/WrappedResourceResponse.h" |
| 72 #include "platform/fonts/GlyphPageTreeNode.h" | 71 #include "platform/fonts/GlyphPageTreeNode.h" |
| 73 #include "platform/network/HTTPParsers.h" | 72 #include "platform/network/HTTPParsers.h" |
| 74 #include "platform/plugins/PluginData.h" | 73 #include "platform/plugins/PluginData.h" |
| 75 #include "public/platform/Platform.h" | 74 #include "public/platform/Platform.h" |
| 76 #include "public/platform/WebApplicationCacheHost.h" | 75 #include "public/platform/WebApplicationCacheHost.h" |
| 77 #include "public/platform/WebMediaPlayerSource.h" | 76 #include "public/platform/WebMediaPlayerSource.h" |
| 78 #include "public/platform/WebMimeRegistry.h" | 77 #include "public/platform/WebMimeRegistry.h" |
| 79 #include "public/platform/WebRTCPeerConnectionHandler.h" | 78 #include "public/platform/WebRTCPeerConnectionHandler.h" |
| 80 #include "public/platform/WebSecurityOrigin.h" | 79 #include "public/platform/WebSecurityOrigin.h" |
| 81 #include "public/platform/WebURL.h" | 80 #include "public/platform/WebURL.h" |
| 82 #include "public/platform/WebURLError.h" | 81 #include "public/platform/WebURLError.h" |
| 83 #include "public/platform/WebVector.h" | 82 #include "public/platform/WebVector.h" |
| 84 #include "public/platform/modules/mediasession/WebMediaSession.h" | |
| 85 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h" | 83 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h" |
| 86 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h
" | 84 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h
" |
| 87 #include "public/web/WebAutofillClient.h" | 85 #include "public/web/WebAutofillClient.h" |
| 88 #include "public/web/WebContentSettingsClient.h" | 86 #include "public/web/WebContentSettingsClient.h" |
| 89 #include "public/web/WebDOMEvent.h" | 87 #include "public/web/WebDOMEvent.h" |
| 90 #include "public/web/WebDocument.h" | 88 #include "public/web/WebDocument.h" |
| 91 #include "public/web/WebFormElement.h" | 89 #include "public/web/WebFormElement.h" |
| 92 #include "public/web/WebFrameClient.h" | 90 #include "public/web/WebFrameClient.h" |
| 93 #include "public/web/WebNode.h" | 91 #include "public/web/WebNode.h" |
| 94 #include "public/web/WebPlugin.h" | 92 #include "public/web/WebPlugin.h" |
| (...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 if (!webFrame || !webFrame->client()) | 784 if (!webFrame || !webFrame->client()) |
| 787 return nullptr; | 785 return nullptr; |
| 788 | 786 |
| 789 HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMe
dia::from(htmlMediaElement); | 787 HTMLMediaElementEncryptedMedia& encryptedMedia = HTMLMediaElementEncryptedMe
dia::from(htmlMediaElement); |
| 790 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)
); | 788 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)
); |
| 791 return wrapUnique(webFrame->client()->createMediaPlayer(source, | 789 return wrapUnique(webFrame->client()->createMediaPlayer(source, |
| 792 client, &encryptedMedia, | 790 client, &encryptedMedia, |
| 793 encryptedMedia.contentDecryptionModule(), sinkId)); | 791 encryptedMedia.contentDecryptionModule(), sinkId)); |
| 794 } | 792 } |
| 795 | 793 |
| 796 std::unique_ptr<WebMediaSession> FrameLoaderClientImpl::createWebMediaSession() | |
| 797 { | |
| 798 if (!m_webFrame->client()) | |
| 799 return nullptr; | |
| 800 | |
| 801 return wrapUnique(m_webFrame->client()->createMediaSession()); | |
| 802 } | |
| 803 | |
| 804 ObjectContentType FrameLoaderClientImpl::getObjectContentType( | 794 ObjectContentType FrameLoaderClientImpl::getObjectContentType( |
| 805 const KURL& url, | 795 const KURL& url, |
| 806 const String& explicitMimeType, | 796 const String& explicitMimeType, |
| 807 bool shouldPreferPlugInsForImages) | 797 bool shouldPreferPlugInsForImages) |
| 808 { | 798 { |
| 809 // This code is based on Apple's implementation from | 799 // This code is based on Apple's implementation from |
| 810 // WebCoreSupport/WebFrameBridge.mm. | 800 // WebCoreSupport/WebFrameBridge.mm. |
| 811 | 801 |
| 812 String mimeType = explicitMimeType; | 802 String mimeType = explicitMimeType; |
| 813 if (mimeType.isEmpty()) { | 803 if (mimeType.isEmpty()) { |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 997 { | 987 { |
| 998 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); | 988 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); |
| 999 } | 989 } |
| 1000 | 990 |
| 1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) | 991 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) |
| 1002 { | 992 { |
| 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 993 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1004 } | 994 } |
| 1005 | 995 |
| 1006 } // namespace blink | 996 } // namespace blink |
| OLD | NEW |