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