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 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
895 void FrameLoaderClientImpl::didChangeFrameOwnerProperties( | 895 void FrameLoaderClientImpl::didChangeFrameOwnerProperties( |
896 HTMLFrameElementBase* frameElement) { | 896 HTMLFrameElementBase* frameElement) { |
897 if (!m_webFrame->client()) | 897 if (!m_webFrame->client()) |
898 return; | 898 return; |
899 | 899 |
900 m_webFrame->client()->didChangeFrameOwnerProperties( | 900 m_webFrame->client()->didChangeFrameOwnerProperties( |
901 WebFrame::fromFrame(frameElement->contentFrame()), | 901 WebFrame::fromFrame(frameElement->contentFrame()), |
902 WebFrameOwnerProperties( | 902 WebFrameOwnerProperties( |
903 frameElement->scrollingMode(), frameElement->marginWidth(), | 903 frameElement->scrollingMode(), frameElement->marginWidth(), |
904 frameElement->marginHeight(), frameElement->allowFullscreen(), | 904 frameElement->marginHeight(), frameElement->allowFullscreen(), |
905 frameElement->delegatedPermissions())); | 905 frameElement->csp(), frameElement->delegatedPermissions())); |
906 } | 906 } |
907 | 907 |
908 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( | 908 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( |
909 WebRTCPeerConnectionHandler* handler) { | 909 WebRTCPeerConnectionHandler* handler) { |
910 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); | 910 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); |
911 } | 911 } |
912 | 912 |
913 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { | 913 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { |
914 if (m_webFrame->client()) | 914 if (m_webFrame->client()) |
915 return m_webFrame->client()->allowWebGL(enabledPerSettings); | 915 return m_webFrame->client()->allowWebGL(enabledPerSettings); |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
999 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { | 999 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { |
1000 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) | 1000 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) |
1001 ->devToolsAgentImpl(); | 1001 ->devToolsAgentImpl(); |
1002 } | 1002 } |
1003 | 1003 |
1004 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { | 1004 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { |
1005 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1005 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
1006 } | 1006 } |
1007 | 1007 |
1008 } // namespace blink | 1008 } // namespace blink |
OLD | NEW |