| 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 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader); | 921 m_webFrame->client()->didSetFeaturePolicyHeader(parsedHeader); |
| 922 } | 922 } |
| 923 | 923 |
| 924 void LocalFrameClientImpl::didAddContentSecurityPolicies( | 924 void LocalFrameClientImpl::didAddContentSecurityPolicies( |
| 925 const blink::WebVector<WebContentSecurityPolicy>& policies) { | 925 const blink::WebVector<WebContentSecurityPolicy>& policies) { |
| 926 if (m_webFrame->client()) | 926 if (m_webFrame->client()) |
| 927 m_webFrame->client()->didAddContentSecurityPolicies(policies); | 927 m_webFrame->client()->didAddContentSecurityPolicies(policies); |
| 928 } | 928 } |
| 929 | 929 |
| 930 void LocalFrameClientImpl::didChangeFrameOwnerProperties( | 930 void LocalFrameClientImpl::didChangeFrameOwnerProperties( |
| 931 HTMLFrameElementBase* frameElement) { | 931 HTMLFrameOwnerElement* frameElement) { |
| 932 if (!m_webFrame->client()) | 932 if (!m_webFrame->client()) |
| 933 return; | 933 return; |
| 934 | 934 |
| 935 m_webFrame->client()->didChangeFrameOwnerProperties( | 935 m_webFrame->client()->didChangeFrameOwnerProperties( |
| 936 WebFrame::fromFrame(frameElement->contentFrame()), | 936 WebFrame::fromFrame(frameElement->contentFrame()), |
| 937 WebFrameOwnerProperties( | 937 WebFrameOwnerProperties( |
| 938 frameElement->browsingContextContainerName(), | 938 frameElement->browsingContextContainerName(), |
| 939 frameElement->scrollingMode(), frameElement->marginWidth(), | 939 frameElement->scrollingMode(), frameElement->marginWidth(), |
| 940 frameElement->marginHeight(), frameElement->allowFullscreen(), | 940 frameElement->marginHeight(), frameElement->allowFullscreen(), |
| 941 frameElement->allowPaymentRequest(), frameElement->csp(), | 941 frameElement->allowPaymentRequest(), frameElement->isDisplayNone(), |
| 942 frameElement->allowedFeatures())); | 942 frameElement->csp(), frameElement->allowedFeatures())); |
| 943 } | 943 } |
| 944 | 944 |
| 945 void LocalFrameClientImpl::dispatchWillStartUsingPeerConnectionHandler( | 945 void LocalFrameClientImpl::dispatchWillStartUsingPeerConnectionHandler( |
| 946 WebRTCPeerConnectionHandler* handler) { | 946 WebRTCPeerConnectionHandler* handler) { |
| 947 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); | 947 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); |
| 948 } | 948 } |
| 949 | 949 |
| 950 bool LocalFrameClientImpl::allowWebGL(bool enabledPerSettings) { | 950 bool LocalFrameClientImpl::allowWebGL(bool enabledPerSettings) { |
| 951 if (m_webFrame->client()) | 951 if (m_webFrame->client()) |
| 952 return m_webFrame->client()->allowWebGL(enabledPerSettings); | 952 return m_webFrame->client()->allowWebGL(enabledPerSettings); |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 if (m_webFrame->client()) | 1033 if (m_webFrame->client()) |
| 1034 m_webFrame->client()->setHasReceivedUserGesture(); | 1034 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1035 } | 1035 } |
| 1036 | 1036 |
| 1037 void LocalFrameClientImpl::abortClientNavigation() { | 1037 void LocalFrameClientImpl::abortClientNavigation() { |
| 1038 if (m_webFrame->client()) | 1038 if (m_webFrame->client()) |
| 1039 m_webFrame->client()->abortClientNavigation(); | 1039 m_webFrame->client()->abortClientNavigation(); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 } // namespace blink | 1042 } // namespace blink |
| OLD | NEW |