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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.h

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 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 void sendPings(const WebNode& contextNode, const WebURL& destinationURL) ove rride; 219 void sendPings(const WebNode& contextNode, const WebURL& destinationURL) ove rride;
220 WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::C achePolicy) 220 WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::C achePolicy)
221 const override; 221 const override;
222 WebURLRequest requestForReload(WebFrameLoadType, const WebURL&) const overri de; 222 WebURLRequest requestForReload(WebFrameLoadType, const WebURL&) const overri de;
223 void load(const WebURLRequest&, WebFrameLoadType, const WebHistoryItem&, 223 void load(const WebURLRequest&, WebFrameLoadType, const WebHistoryItem&,
224 WebHistoryLoadType, bool isClientRedirect) override; 224 WebHistoryLoadType, bool isClientRedirect) override;
225 void loadData( 225 void loadData(
226 const WebData&, const WebString& mimeType, const WebString& textEncoding , 226 const WebData&, const WebString& mimeType, const WebString& textEncoding ,
227 const WebURL& baseURL, const WebURL& unreachableURL, bool replace, WebFr ameLoadType, 227 const WebURL& baseURL, const WebURL& unreachableURL, bool replace, WebFr ameLoadType,
228 const WebHistoryItem&, WebHistoryLoadType, bool isClientRedirect) overri de; 228 const WebHistoryItem&, WebHistoryLoadType, bool isClientRedirect) overri de;
229 void updateForBlockedLoad() override;
229 bool isLoading() const override; 230 bool isLoading() const override;
230 bool isResourceLoadInProgress() const override; 231 bool isResourceLoadInProgress() const override;
231 bool isNavigationScheduled() const override; 232 bool isNavigationScheduled() const override;
232 void setCommittedFirstRealLoad() override; 233 void setCommittedFirstRealLoad() override;
233 void sendOrientationChangeEvent() override; 234 void sendOrientationChangeEvent() override;
234 void willShowInstallBannerPrompt(int requestId, const WebVector<WebString>& platforms, WebAppBannerPromptReply*) override; 235 void willShowInstallBannerPrompt(int requestId, const WebVector<WebString>& platforms, WebAppBannerPromptReply*) override;
235 WebSandboxFlags effectiveSandboxFlags() const override; 236 WebSandboxFlags effectiveSandboxFlags() const override;
236 void forceSandboxFlags(WebSandboxFlags) override; 237 void forceSandboxFlags(WebSandboxFlags) override;
237 void requestRunTask(WebSuspendableTask*) const override; 238 void requestRunTask(WebSuspendableTask*) const override;
238 void didCallAddSearchProvider() override; 239 void didCallAddSearchProvider() override;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 // cleared upon close(). 412 // cleared upon close().
412 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive; 413 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
413 #endif 414 #endif
414 }; 415 };
415 416
416 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 417 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
417 418
418 } // namespace blink 419 } // namespace blink
419 420
420 #endif 421 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrame.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698