(Re-)introduce AncestorThrottle to handle 'X-Frame-Options'.

third_party/WebKit/Source/core/loader/DocumentLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 149 matching lines @@
   struct InitialScrollState {
     DISALLOW_NEW();
     InitialScrollState()
         : wasScrolledByUser(false), didRestoreFromHistory(false) {}
 
     bool wasScrolledByUser;
     bool didRestoreFromHistory;
   };
   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);
 
   Resource* startPreload(Resource::Type, FetchRequest&);
 
   DECLARE_VIRTUAL_TRACE();
 
  protected:
   DocumentLoader(LocalFrame*,
@@ skipping 19 matching lines @@
 
   FrameLoader* frameLoader() const;
 
   void commitIfReady();
   void commitData(const char* bytes, size_t length);
   void clearMainResourceHandle();
 
   bool maybeCreateArchive();
 
   void finishedLoading(double finishTime);
-  void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
+  void cancelLoadAfterCSPDenied(const ResourceResponse&);
   bool redirectReceived(Resource*,
                         const ResourceRequest&,
                         const ResourceResponse&) final;
   void responseReceived(Resource*,
                         const ResourceResponse&,
                         std::unique_ptr<WebDataConsumerHandle>) final;
   void dataReceived(Resource*, const char* data, size_t length) final;
   void processData(const char* data, size_t length);
   void notifyFinished(Resource*) final;
   String debugName() const override { return "DocumentLoader"; }
@@ skipping 35 matching lines @@
   DocumentLoadTiming m_documentLoadTiming;
 
   double m_timeOfLastDataReceived;
 
   Member<ApplicationCacheHost> m_applicationCacheHost;
 
   Member<ContentSecurityPolicy> m_contentSecurityPolicy;
   ClientHintsPreferences m_clientHintsPreferences;
   InitialScrollState m_initialScrollState;
 
-  bool m_wasBlockedAfterXFrameOptionsOrCSP;
+  bool m_wasBlockedAfterCSP;
 
   enum State {
     NotStarted,
     Provisional,
     Committed,
     MainResourceDone,
     SentDidFinishLoad
   };
   State m_state;
 
   // Used to protect against reentrancy into dataReceived().
   bool m_inDataReceived;
   RefPtr<SharedBuffer> m_dataBuffer;
 };
 
 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink
 
 #endif  // DocumentLoader_h