| 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 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 892 if (!m_webFrame->client()) | 892 if (!m_webFrame->client()) |
| 893 return; | 893 return; |
| 894 | 894 |
| 895 m_webFrame->client()->didChangeFrameOwnerProperties( | 895 m_webFrame->client()->didChangeFrameOwnerProperties( |
| 896 WebFrame::fromFrame(frameElement->contentFrame()), | 896 WebFrame::fromFrame(frameElement->contentFrame()), |
| 897 WebFrameOwnerProperties( | 897 WebFrameOwnerProperties( |
| 898 frameElement->browsingContextContainerName(), | 898 frameElement->browsingContextContainerName(), |
| 899 frameElement->scrollingMode(), frameElement->marginWidth(), | 899 frameElement->scrollingMode(), frameElement->marginWidth(), |
| 900 frameElement->marginHeight(), frameElement->allowFullscreen(), | 900 frameElement->marginHeight(), frameElement->allowFullscreen(), |
| 901 frameElement->allowPaymentRequest(), frameElement->csp(), | 901 frameElement->allowPaymentRequest(), frameElement->csp(), |
| 902 frameElement->delegatedPermissions())); | 902 frameElement->delegatedPermissions(), |
| 903 frameElement->allowedFeatureNames())); |
| 903 } | 904 } |
| 904 | 905 |
| 905 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( | 906 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( |
| 906 WebRTCPeerConnectionHandler* handler) { | 907 WebRTCPeerConnectionHandler* handler) { |
| 907 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); | 908 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); |
| 908 } | 909 } |
| 909 | 910 |
| 910 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { | 911 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { |
| 911 if (m_webFrame->client()) | 912 if (m_webFrame->client()) |
| 912 return m_webFrame->client()->allowWebGL(enabledPerSettings); | 913 return m_webFrame->client()->allowWebGL(enabledPerSettings); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1002 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1003 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
| 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1004 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1004 } | 1005 } |
| 1005 | 1006 |
| 1006 void FrameLoaderClientImpl::setHasReceivedUserGesture() { | 1007 void FrameLoaderClientImpl::setHasReceivedUserGesture() { |
| 1007 if (m_webFrame->client()) | 1008 if (m_webFrame->client()) |
| 1008 m_webFrame->client()->setHasReceivedUserGesture(); | 1009 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1009 } | 1010 } |
| 1010 | 1011 |
| 1011 } // namespace blink | 1012 } // namespace blink |
| OLD | NEW |