| Index: Source/core/loader/DocumentLoader.h
|
| diff --git a/Source/core/loader/DocumentLoader.h b/Source/core/loader/DocumentLoader.h
|
| index 9b59f73a38da2a06803d426362e3eed02ae1cfe5..b3d6e8a2c78d8e6b9791514557db331a21a99d41 100644
|
| --- a/Source/core/loader/DocumentLoader.h
|
| +++ b/Source/core/loader/DocumentLoader.h
|
| @@ -33,6 +33,7 @@
|
| #include "core/fetch/RawResource.h"
|
| #include "core/fetch/ResourceLoaderOptions.h"
|
| #include "core/fetch/ResourcePtr.h"
|
| +#include "core/frame/csp/ContentSecurityPolicy.h"
|
| #include "core/loader/DocumentLoadTiming.h"
|
| #include "core/loader/DocumentWriter.h"
|
| #include "core/loader/NavigationAction.h"
|
| @@ -136,6 +137,8 @@ namespace blink {
|
| void clearRedirectChain();
|
| void appendRedirect(const KURL&);
|
|
|
| + PassRefPtr<ContentSecurityPolicy> releaseContentSecurityPolicy() { return m_contentSecurityPolicy.release(); }
|
| +
|
| protected:
|
| DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&);
|
|
|
| @@ -165,6 +168,7 @@ namespace blink {
|
| void willSendRequest(ResourceRequest&, const ResourceResponse&);
|
| void finishedLoading(double finishTime);
|
| void mainReceivedError(const ResourceError&);
|
| + void cancelLoadAfterXFrameOptionsOrCSPDenied(const ResourceResponse&);
|
| virtual void redirectReceived(Resource*, ResourceRequest&, const ResourceResponse&) OVERRIDE FINAL;
|
| virtual void updateRequest(Resource*, const ResourceRequest&) OVERRIDE FINAL;
|
| virtual void responseReceived(Resource*, const ResourceResponse&) OVERRIDE FINAL;
|
| @@ -220,6 +224,8 @@ namespace blink {
|
|
|
| friend class ApplicationCacheHost; // for substitute resource delivery
|
| OwnPtrWillBePersistent<ApplicationCacheHost> m_applicationCacheHost;
|
| +
|
| + RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
|
| };
|
| }
|
|
|
|
|