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

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.h

Issue 2488743003: (Re-)introduce AncestorThrottle to handle 'X-Frame-Options'. (Closed)
Patch Set: Addressed comments (@clamy). Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/loader/DocumentLoader.h
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.h b/third_party/WebKit/Source/core/loader/DocumentLoader.h
index fd1ebf460522b211bf40ca020dc6577b5f455fe7..8dd6e27630a63dc9d1061e5de55496388ebf09a6 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.h
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.h
@@ -167,12 +167,8 @@ class CORE_EXPORT DocumentLoader
};
InitialScrollState& initialScrollState() { return m_initialScrollState; }
- void setWasBlockedAfterXFrameOptionsOrCSP() {
- m_wasBlockedAfterXFrameOptionsOrCSP = true;
- }
- bool wasBlockedAfterXFrameOptionsOrCSP() {
- return m_wasBlockedAfterXFrameOptionsOrCSP;
- }
+ void setWasBlockedAfterCSP() { m_wasBlockedAfterCSP = true; }
+ bool wasBlockedAfterCSP() { return m_wasBlockedAfterCSP; }
void dispatchLinkHeaderPreloads(ViewportDescriptionWrapper*,
LinkLoader::MediaPreloadPolicy);
@@ -212,7 +208,7 @@ class CORE_EXPORT DocumentLoader
bool maybeCreateArchive();
void finishedLoading(double finishTime);
- void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
+ void cancelLoadAfterCSPDenied(const ResourceResponse&);
bool redirectReceived(Resource*,
const ResourceRequest&,
const ResourceResponse&) final;
@@ -268,7 +264,7 @@ class CORE_EXPORT DocumentLoader
ClientHintsPreferences m_clientHintsPreferences;
InitialScrollState m_initialScrollState;
- bool m_wasBlockedAfterXFrameOptionsOrCSP;
+ bool m_wasBlockedAfterCSP;
enum State {
NotStarted,

Powered by Google App Engine
This is Rietveld 408576698