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

Side by Side Diff: third_party/WebKit/public/web/WebLocalFrame.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
« no previous file with comments | « third_party/WebKit/public/web/WebFrameClient.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WebLocalFrame_h 5 #ifndef WebLocalFrame_h
6 #define WebLocalFrame_h 6 #define WebLocalFrame_h
7 7
8 #include "WebFrame.h" 8 #include "WebFrame.h"
9 #include "WebFrameLoadType.h" 9 #include "WebFrameLoadType.h"
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 const WebString& textEncoding, 116 const WebString& textEncoding,
117 const WebURL& baseURL, 117 const WebURL& baseURL,
118 const WebURL& unreachableURL = WebURL(), 118 const WebURL& unreachableURL = WebURL(),
119 bool replace = false, 119 bool replace = false,
120 WebFrameLoadType = WebFrameLoadType::Standard, 120 WebFrameLoadType = WebFrameLoadType::Standard,
121 const WebHistoryItem& = WebHistoryItem(), 121 const WebHistoryItem& = WebHistoryItem(),
122 WebHistoryLoadType = WebHistoryDifferentDocumentLoad, 122 WebHistoryLoadType = WebHistoryDifferentDocumentLoad,
123 bool isClientRedirect = false) 123 bool isClientRedirect = false)
124 = 0; 124 = 0;
125 125
126 // Inform the frame that its load was blocked, for example due to
127 // X-Frame-Options or CSP.
128 virtual void updateForBlockedLoad() = 0;
129
126 // Navigation State ------------------------------------------------------- 130 // Navigation State -------------------------------------------------------
127 131
128 // Returns true if the current frame's load event has not completed. 132 // Returns true if the current frame's load event has not completed.
129 virtual bool isLoading() const = 0; 133 virtual bool isLoading() const = 0;
130 134
131 // Returns true if any resource load is currently in progress. Exposed 135 // Returns true if any resource load is currently in progress. Exposed
132 // primarily for use in layout tests. You probably want isLoading() 136 // primarily for use in layout tests. You probably want isLoading()
133 // instead. 137 // instead.
134 virtual bool isResourceLoadInProgress() const = 0; 138 virtual bool isResourceLoadInProgress() const = 0;
135 139
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 // to call these on a WebLocalFrame. 335 // to call these on a WebLocalFrame.
332 bool isWebLocalFrame() const override = 0; 336 bool isWebLocalFrame() const override = 0;
333 WebLocalFrame* toWebLocalFrame() override = 0; 337 WebLocalFrame* toWebLocalFrame() override = 0;
334 bool isWebRemoteFrame() const override = 0; 338 bool isWebRemoteFrame() const override = 0;
335 WebRemoteFrame* toWebRemoteFrame() override = 0; 339 WebRemoteFrame* toWebRemoteFrame() override = 0;
336 }; 340 };
337 341
338 } // namespace blink 342 } // namespace blink
339 343
340 #endif // WebLocalFrame_h 344 #endif // WebLocalFrame_h
OLDNEW
« no previous file with comments | « third_party/WebKit/public/web/WebFrameClient.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698