| 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 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 773 WebMediaPlayerClient* client) { | 773 WebMediaPlayerClient* client) { |
| 774 WebLocalFrameImpl* webFrame = | 774 WebLocalFrameImpl* webFrame = |
| 775 WebLocalFrameImpl::fromFrame(htmlMediaElement.document().frame()); | 775 WebLocalFrameImpl::fromFrame(htmlMediaElement.document().frame()); |
| 776 | 776 |
| 777 if (!webFrame || !webFrame->client()) | 777 if (!webFrame || !webFrame->client()) |
| 778 return nullptr; | 778 return nullptr; |
| 779 | 779 |
| 780 HTMLMediaElementEncryptedMedia& encryptedMedia = | 780 HTMLMediaElementEncryptedMedia& encryptedMedia = |
| 781 HTMLMediaElementEncryptedMedia::from(htmlMediaElement); | 781 HTMLMediaElementEncryptedMedia::from(htmlMediaElement); |
| 782 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)); | 782 WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement)); |
| 783 return wrapUnique(webFrame->client()->createMediaPlayer( | 783 return WTF::wrapUnique(webFrame->client()->createMediaPlayer( |
| 784 source, client, &encryptedMedia, encryptedMedia.contentDecryptionModule(), | 784 source, client, &encryptedMedia, encryptedMedia.contentDecryptionModule(), |
| 785 sinkId)); | 785 sinkId)); |
| 786 } | 786 } |
| 787 | 787 |
| 788 WebRemotePlaybackClient* FrameLoaderClientImpl::createWebRemotePlaybackClient( | 788 WebRemotePlaybackClient* FrameLoaderClientImpl::createWebRemotePlaybackClient( |
| 789 HTMLMediaElement& htmlMediaElement) { | 789 HTMLMediaElement& htmlMediaElement) { |
| 790 return HTMLMediaElementRemotePlayback::remote(htmlMediaElement); | 790 return HTMLMediaElementRemotePlayback::remote(htmlMediaElement); |
| 791 } | 791 } |
| 792 | 792 |
| 793 ObjectContentType FrameLoaderClientImpl::getObjectContentType( | 793 ObjectContentType FrameLoaderClientImpl::getObjectContentType( |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 915 | 915 |
| 916 void FrameLoaderClientImpl::dispatchWillInsertBody() { | 916 void FrameLoaderClientImpl::dispatchWillInsertBody() { |
| 917 if (m_webFrame->client()) | 917 if (m_webFrame->client()) |
| 918 m_webFrame->client()->willInsertBody(m_webFrame); | 918 m_webFrame->client()->willInsertBody(m_webFrame); |
| 919 } | 919 } |
| 920 | 920 |
| 921 std::unique_ptr<WebServiceWorkerProvider> | 921 std::unique_ptr<WebServiceWorkerProvider> |
| 922 FrameLoaderClientImpl::createServiceWorkerProvider() { | 922 FrameLoaderClientImpl::createServiceWorkerProvider() { |
| 923 if (!m_webFrame->client()) | 923 if (!m_webFrame->client()) |
| 924 return nullptr; | 924 return nullptr; |
| 925 return wrapUnique(m_webFrame->client()->createServiceWorkerProvider()); | 925 return WTF::wrapUnique(m_webFrame->client()->createServiceWorkerProvider()); |
| 926 } | 926 } |
| 927 | 927 |
| 928 bool FrameLoaderClientImpl::isControlledByServiceWorker( | 928 bool FrameLoaderClientImpl::isControlledByServiceWorker( |
| 929 DocumentLoader& loader) { | 929 DocumentLoader& loader) { |
| 930 return m_webFrame->client() && | 930 return m_webFrame->client() && |
| 931 m_webFrame->client()->isControlledByServiceWorker( | 931 m_webFrame->client()->isControlledByServiceWorker( |
| 932 *WebDataSourceImpl::fromDocumentLoader(&loader)); | 932 *WebDataSourceImpl::fromDocumentLoader(&loader)); |
| 933 } | 933 } |
| 934 | 934 |
| 935 int64_t FrameLoaderClientImpl::serviceWorkerID(DocumentLoader& loader) { | 935 int64_t FrameLoaderClientImpl::serviceWorkerID(DocumentLoader& loader) { |
| 936 if (!m_webFrame->client()) | 936 if (!m_webFrame->client()) |
| 937 return -1; | 937 return -1; |
| 938 return m_webFrame->client()->serviceWorkerID( | 938 return m_webFrame->client()->serviceWorkerID( |
| 939 *WebDataSourceImpl::fromDocumentLoader(&loader)); | 939 *WebDataSourceImpl::fromDocumentLoader(&loader)); |
| 940 } | 940 } |
| 941 | 941 |
| 942 SharedWorkerRepositoryClient* | 942 SharedWorkerRepositoryClient* |
| 943 FrameLoaderClientImpl::sharedWorkerRepositoryClient() { | 943 FrameLoaderClientImpl::sharedWorkerRepositoryClient() { |
| 944 return m_webFrame->sharedWorkerRepositoryClient(); | 944 return m_webFrame->sharedWorkerRepositoryClient(); |
| 945 } | 945 } |
| 946 | 946 |
| 947 std::unique_ptr<WebApplicationCacheHost> | 947 std::unique_ptr<WebApplicationCacheHost> |
| 948 FrameLoaderClientImpl::createApplicationCacheHost( | 948 FrameLoaderClientImpl::createApplicationCacheHost( |
| 949 WebApplicationCacheHostClient* client) { | 949 WebApplicationCacheHostClient* client) { |
| 950 if (!m_webFrame->client()) | 950 if (!m_webFrame->client()) |
| 951 return nullptr; | 951 return nullptr; |
| 952 return wrapUnique(m_webFrame->client()->createApplicationCacheHost(client)); | 952 return WTF::wrapUnique( |
| 953 m_webFrame->client()->createApplicationCacheHost(client)); |
| 953 } | 954 } |
| 954 | 955 |
| 955 void FrameLoaderClientImpl::dispatchDidChangeManifest() { | 956 void FrameLoaderClientImpl::dispatchDidChangeManifest() { |
| 956 if (m_webFrame->client()) | 957 if (m_webFrame->client()) |
| 957 m_webFrame->client()->didChangeManifest(); | 958 m_webFrame->client()->didChangeManifest(); |
| 958 } | 959 } |
| 959 | 960 |
| 960 unsigned FrameLoaderClientImpl::backForwardLength() { | 961 unsigned FrameLoaderClientImpl::backForwardLength() { |
| 961 WebViewImpl* webview = m_webFrame->viewImpl(); | 962 WebViewImpl* webview = m_webFrame->viewImpl(); |
| 962 if (!webview || !webview->client()) | 963 if (!webview || !webview->client()) |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { | 996 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { |
| 996 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) | 997 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) |
| 997 ->devToolsAgentImpl(); | 998 ->devToolsAgentImpl(); |
| 998 } | 999 } |
| 999 | 1000 |
| 1000 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 1001 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1002 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1002 } | 1003 } |
| 1003 | 1004 |
| 1004 } // namespace blink | 1005 } // namespace blink |
| OLD | NEW |