| 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 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 911 ContentSecurityPolicyHeaderSource source, | 911 ContentSecurityPolicyHeaderSource source, |
| 912 const std::vector<WebContentSecurityPolicyPolicy>& policies) { | 912 const std::vector<WebContentSecurityPolicyPolicy>& policies) { |
| 913 if (m_webFrame->client()) { | 913 if (m_webFrame->client()) { |
| 914 m_webFrame->client()->didAddContentSecurityPolicy( | 914 m_webFrame->client()->didAddContentSecurityPolicy( |
| 915 headerValue, static_cast<WebContentSecurityPolicyType>(type), | 915 headerValue, static_cast<WebContentSecurityPolicyType>(type), |
| 916 static_cast<WebContentSecurityPolicySource>(source), policies); | 916 static_cast<WebContentSecurityPolicySource>(source), policies); |
| 917 } | 917 } |
| 918 } | 918 } |
| 919 | 919 |
| 920 void LocalFrameClientImpl::didChangeFrameOwnerProperties( | 920 void LocalFrameClientImpl::didChangeFrameOwnerProperties( |
| 921 HTMLFrameElementBase* frameElement) { | 921 HTMLFrameOwnerElement* frameElement) { |
| 922 if (!m_webFrame->client()) | 922 if (!m_webFrame->client()) |
| 923 return; | 923 return; |
| 924 | 924 |
| 925 m_webFrame->client()->didChangeFrameOwnerProperties( | 925 m_webFrame->client()->didChangeFrameOwnerProperties( |
| 926 WebFrame::fromFrame(frameElement->contentFrame()), | 926 WebFrame::fromFrame(frameElement->contentFrame()), |
| 927 WebFrameOwnerProperties( | 927 WebFrameOwnerProperties( |
| 928 frameElement->browsingContextContainerName(), | 928 frameElement->browsingContextContainerName(), |
| 929 frameElement->scrollingMode(), frameElement->marginWidth(), | 929 frameElement->scrollingMode(), frameElement->marginWidth(), |
| 930 frameElement->marginHeight(), frameElement->allowFullscreen(), | 930 frameElement->marginHeight(), frameElement->allowFullscreen(), |
| 931 frameElement->allowPaymentRequest(), frameElement->csp(), | 931 frameElement->allowPaymentRequest(), frameElement->isDisplayNone(), |
| 932 frameElement->delegatedPermissions(), | 932 frameElement->csp(), frameElement->delegatedPermissions(), |
| 933 frameElement->allowedFeatures())); | 933 frameElement->allowedFeatures())); |
| 934 } | 934 } |
| 935 | 935 |
| 936 void LocalFrameClientImpl::dispatchWillStartUsingPeerConnectionHandler( | 936 void LocalFrameClientImpl::dispatchWillStartUsingPeerConnectionHandler( |
| 937 WebRTCPeerConnectionHandler* handler) { | 937 WebRTCPeerConnectionHandler* handler) { |
| 938 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); | 938 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); |
| 939 } | 939 } |
| 940 | 940 |
| 941 bool LocalFrameClientImpl::allowWebGL(bool enabledPerSettings) { | 941 bool LocalFrameClientImpl::allowWebGL(bool enabledPerSettings) { |
| 942 if (m_webFrame->client()) | 942 if (m_webFrame->client()) |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 KURL LocalFrameClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1019 KURL LocalFrameClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 1020 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1020 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1021 } | 1021 } |
| 1022 | 1022 |
| 1023 void LocalFrameClientImpl::setHasReceivedUserGesture() { | 1023 void LocalFrameClientImpl::setHasReceivedUserGesture() { |
| 1024 if (m_webFrame->client()) | 1024 if (m_webFrame->client()) |
| 1025 m_webFrame->client()->setHasReceivedUserGesture(); | 1025 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1026 } | 1026 } |
| 1027 | 1027 |
| 1028 } // namespace blink | 1028 } // namespace blink |
| OLD | NEW |