Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2378643002: Propagating csp attribute changes on frameOwnerPropertiesChanged() (Closed)
Patch Set: Separating CSP test, addressing co commnets Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
892 static_cast<WebContentSecurityPolicyType>(type), 892 static_cast<WebContentSecurityPolicyType>(type),
893 static_cast<WebContentSecurityPolicySource>(source)); 893 static_cast<WebContentSecurityPolicySource>(source));
894 } 894 }
895 } 895 }
896 896
897 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement) 897 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement)
898 { 898 {
899 if (!m_webFrame->client()) 899 if (!m_webFrame->client())
900 return; 900 return;
901 901
902 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), frameElement->delegatedPermissions())); 902 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight(), frameElement->allow Fullscreen(), frameElement->csp(), frameElement->delegatedPermissions()));
903 } 903 }
904 904
905 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) 905 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler)
906 { 906 {
907 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 907 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
908 } 908 }
909 909
910 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) 910 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings)
911 { 911 {
912 if (m_webFrame->client()) 912 if (m_webFrame->client())
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 { 997 {
998 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl(); 998 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl();
999 } 999 }
1000 1000
1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) 1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url)
1002 { 1002 {
1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1004 } 1004 }
1005 1005
1006 } // namespace blink 1006 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698