Source/core/fetch/ResourceFetcher.h - Issue 954233003: Enable SRI only for same origin and CORS content.

Side by Side Diff: Source/core/fetch/ResourceFetcher.h

Issue 954233003: Enable SRI only for same origin and CORS content. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase on ToT Created 5 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

« LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-style-no-cors.html ('K') | « Source/core/fetch/Resource.cpp ('k') | Source/core/fetch/ResourceFetcher.cpp » ('j') | Source/core/frame/SubresourceIntegrityTest.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)	2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)

3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>	3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>

4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/	5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/

6	6

7 This library is free software; you can redistribute it and/or	7 This library is free software; you can redistribute it and/or

8 modify it under the terms of the GNU Library General Public	8 modify it under the terms of the GNU Library General Public

9 License as published by the Free Software Foundation; either	9 License as published by the Free Software Foundation; either

10 version 2 of the License, or (at your option) any later version.	10 version 2 of the License, or (at your option) any later version.

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
146 virtual void willSendRequest(unsigned long identifier, ResourceRequest&, con st ResourceResponse& redirectResponse, const FetchInitiatorInfo&) override;	146 virtual void willSendRequest(unsigned long identifier, ResourceRequest&, con st ResourceResponse& redirectResponse, const FetchInitiatorInfo&) override;

147 virtual void didReceiveResponse(const Resource*, const ResourceResponse&) ov erride;	147 virtual void didReceiveResponse(const Resource*, const ResourceResponse&) ov erride;

148 virtual void didReceiveData(const Resource, const char data, int dataLengt h, int encodedDataLength) override;	148 virtual void didReceiveData(const Resource, const char data, int dataLengt h, int encodedDataLength) override;

149 virtual void didDownloadData(const Resource*, int dataLength, int encodedDat aLength) override;	149 virtual void didDownloadData(const Resource*, int dataLength, int encodedDat aLength) override;

150 virtual void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*) overri de;	150 virtual void subresourceLoaderFinishedLoadingOnePart(ResourceLoader*) overri de;

151 virtual void didInitializeResourceLoader(ResourceLoader*) override;	151 virtual void didInitializeResourceLoader(ResourceLoader*) override;

152 virtual void willStartLoadingResource(Resource*, ResourceRequest&) override;	152 virtual void willStartLoadingResource(Resource*, ResourceRequest&) override;

153 virtual bool defersLoading() const override;	153 virtual bool defersLoading() const override;

154 virtual bool isLoadedBy(ResourceLoaderHost*) const override;	154 virtual bool isLoadedBy(ResourceLoaderHost*) const override;

155 virtual bool canAccessRedirect(Resource*, ResourceRequest&, const ResourceRe sponse&, ResourceLoaderOptions&) override;	155 virtual bool canAccessRedirect(Resource*, ResourceRequest&, const ResourceRe sponse&, ResourceLoaderOptions&) override;

156 virtual bool canAccessResource(Resource, SecurityOrigin, const KURL&) cons t override;	156 virtual bool canAccessResource(Resource, SecurityOrigin, const KURL&, Acce ssControlLoggingDecision) const override;

157 virtual bool isControlledByServiceWorker() const override;	157 virtual bool isControlledByServiceWorker() const override;

158	158

159 #if !ENABLE(OILPAN)	159 #if !ENABLE(OILPAN)

160 virtual void refResourceLoaderHost() override;	160 virtual void refResourceLoaderHost() override;

161 virtual void derefResourceLoaderHost() override;	161 virtual void derefResourceLoaderHost() override;

162 #endif	162 #endif

163	163

164 int64_t serviceWorkerID() const;	164 int64_t serviceWorkerID() const;

165 void acceptDataFromThreadedReceiver(unsigned long identifier, const char* da ta, int dataLength, int encodedDataLength);	165 void acceptDataFromThreadedReceiver(unsigned long identifier, const char* da ta, int dataLength, int encodedDataLength);

166	166

(...skipping 110 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
277 m_loader->m_allowStaleResources = m_previousState;	277 m_loader->m_allowStaleResources = m_previousState;

278 }	278 }

279 private:	279 private:

280 ResourceFetcher* m_loader;	280 ResourceFetcher* m_loader;

281 bool m_previousState;	281 bool m_previousState;

282 };	282 };

283	283

284 } // namespace blink	284 } // namespace blink

285	285

286 #endif	286 #endif

OLD	NEW