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

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

Issue 2321503002: (Re-)introduce AncestorThrottle to handle 'X-Frame-Options'. (Closed)
Patch Set: Ugh. Created 4 years, 3 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 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 48a9a34a1ffdac665fd74848e86b7320a6f81ae5..515143c894933b9b330ea7a0924d6a1b1253d3a0 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.h
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.h
@@ -145,8 +145,8 @@ public:
};
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);
@@ -176,7 +176,7 @@ private:
bool maybeCreateArchive();
void finishedLoading(double finishTime);
- void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
+ void cancelLoadAfterCSPDenied(const ResourceResponse&);
void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) final;
void responseReceived(Resource*, const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>) final;
void dataReceived(Resource*, const char* data, size_t length) final;
@@ -228,7 +228,7 @@ private:
ClientHintsPreferences m_clientHintsPreferences;
InitialScrollState m_initialScrollState;
- bool m_wasBlockedAfterXFrameOptionsOrCSP;
+ bool m_wasBlockedAfterCSP;
enum State {
NotStarted,

Powered by Google App Engine
This is Rietveld 408576698