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

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

Issue 1710283003: OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off the relaxed DCHECK in OnCrossSiteResponse into separate CL Created 4 years, 9 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 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 } 922 }
923 923
924 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement) 924 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement)
925 { 925 {
926 if (!m_webFrame->client()) 926 if (!m_webFrame->client())
927 return; 927 return;
928 928
929 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight())); 929 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight()));
930 } 930 }
931 931
932 void FrameLoaderClientImpl::didBlockLoad()
933 {
934 if (!m_webFrame->client())
935 return;
936 m_webFrame->client()->didBlockLoad();
937 }
938
932 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle) 939 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)
933 { 940 {
934 m_webFrame->client()->willOpenWebSocket(handle); 941 m_webFrame->client()->willOpenWebSocket(handle);
935 } 942 }
936 943
937 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) 944 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler)
938 { 945 {
939 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 946 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
940 } 947 }
941 948
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1030
1024 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 1031 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
1025 { 1032 {
1026 if (m_webFrame->client()) { 1033 if (m_webFrame->client()) {
1027 m_webFrame->client()->suddenTerminationDisablerChanged( 1034 m_webFrame->client()->suddenTerminationDisablerChanged(
1028 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 1035 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
1029 } 1036 }
1030 } 1037 }
1031 1038
1032 } // namespace blink 1039 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698