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

Side by Side Diff: Source/core/fetch/Resource.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: Fixed test failures 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
« no previous file with comments | « Source/core/dom/ScriptLoader.cpp ('k') | Source/core/fetch/Resource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 && type() != Raw 169 && type() != Raw
170 && type() != TextTrack; 170 && type() != TextTrack;
171 } 171 }
172 172
173 // Computes the status of an object after loading. 173 // Computes the status of an object after loading.
174 // Updates the expire date on the cache entry file 174 // Updates the expire date on the cache entry file
175 void setLoadFinishTime(double finishTime) { m_loadFinishTime = finishTime; } 175 void setLoadFinishTime(double finishTime) { m_loadFinishTime = finishTime; }
176 void finish(); 176 void finish();
177 177
178 // FIXME: Remove the stringless variant once all the callsites' error messag es are updated. 178 // FIXME: Remove the stringless variant once all the callsites' error messag es are updated.
179 bool passesAccessControlCheck(ExecutionContext*, SecurityOrigin*); 179 bool passesAccessControlCheck(ExecutionContext*, SecurityOrigin*) const;
180 bool passesAccessControlCheck(ExecutionContext*, SecurityOrigin*, String& er rorDescription); 180 bool passesAccessControlCheck(ExecutionContext*, SecurityOrigin*, String& er rorDescription) const;
181
182 bool isEligibleForIntegrityCheck(ExecutionContext*) const;
181 183
182 void clearLoader(); 184 void clearLoader();
183 185
184 SharedBuffer* resourceBuffer() const { return m_data.get(); } 186 SharedBuffer* resourceBuffer() const { return m_data.get(); }
185 void setResourceBuffer(PassRefPtr<SharedBuffer>); 187 void setResourceBuffer(PassRefPtr<SharedBuffer>);
186 188
187 virtual void willFollowRedirect(ResourceRequest&, const ResourceResponse&); 189 virtual void willFollowRedirect(ResourceRequest&, const ResourceResponse&);
188 190
189 virtual void updateRequest(const ResourceRequest&) { } 191 virtual void updateRequest(const ResourceRequest&) { }
190 virtual void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataCon sumerHandle>); 192 virtual void responseReceived(const ResourceResponse&, PassOwnPtr<WebDataCon sumerHandle>);
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 const char* ResourceTypeName(Resource::Type); 416 const char* ResourceTypeName(Resource::Type);
415 #endif 417 #endif
416 418
417 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \ 419 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
418 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \ 420 DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->type() = = Resource::typeName, resource.type() == Resource::typeName); \
419 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); } 421 inline typeName##Resource* to##typeName##Resource(const ResourcePtr<Resource >& ptr) { return to##typeName##Resource(ptr.get()); }
420 422
421 } 423 }
422 424
423 #endif 425 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/ScriptLoader.cpp ('k') | Source/core/fetch/Resource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698