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

Side by Side Diff: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.h

Issue 2855163002: Avoid sending mixed-content requests for ImageSet contexts (Closed)
Patch Set: Better check and a test Created 3 years, 7 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
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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
5 rights reserved. 5 rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 123
124 enum LoaderFinishType { kDidFinishLoading, kDidFinishFirstPartInMultipart }; 124 enum LoaderFinishType { kDidFinishLoading, kDidFinishFirstPartInMultipart };
125 void HandleLoaderFinish(Resource*, double finish_time, LoaderFinishType); 125 void HandleLoaderFinish(Resource*, double finish_time, LoaderFinishType);
126 void HandleLoaderError(Resource*, const ResourceError&); 126 void HandleLoaderError(Resource*, const ResourceError&);
127 bool IsControlledByServiceWorker() const; 127 bool IsControlledByServiceWorker() const;
128 128
129 static const ResourceLoaderOptions& DefaultResourceOptions(); 129 static const ResourceLoaderOptions& DefaultResourceOptions();
130 130
131 String GetCacheIdentifier() const; 131 String GetCacheIdentifier() const;
132 132
133 enum IsImageSet { kImageNotImageSet, kImageIsImageSet };
134
133 WARN_UNUSED_RESULT static WebURLRequest::RequestContext 135 WARN_UNUSED_RESULT static WebURLRequest::RequestContext
134 DetermineRequestContext(Resource::Type, bool is_main_frame); 136 DetermineRequestContext(Resource::Type, IsImageSet, bool is_main_frame);
135 WARN_UNUSED_RESULT WebURLRequest::RequestContext DetermineRequestContext( 137 WARN_UNUSED_RESULT WebURLRequest::RequestContext DetermineRequestContext(
136 Resource::Type) const; 138 Resource::Type,
139 IsImageSet) const;
137 140
138 void UpdateAllImageResourcePriorities(); 141 void UpdateAllImageResourcePriorities();
139 142
140 void ReloadLoFiImages(); 143 void ReloadLoFiImages();
141 144
142 // Calling this method before main document resource is fetched is invalid. 145 // Calling this method before main document resource is fetched is invalid.
143 ResourceTimingInfo* GetNavigationTimingInfo(); 146 ResourceTimingInfo* GetNavigationTimingInfo();
144 147
145 bool ContainsAsPreloadForTesting(Resource* resource) const { 148 bool ContainsAsPreloadForTesting(Resource* resource) const {
146 return preloads_.Contains(resource); 149 return preloads_.Contains(resource);
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 } 276 }
274 277
275 private: 278 private:
276 Member<ResourceFetcher> loader_; 279 Member<ResourceFetcher> loader_;
277 bool previous_state_; 280 bool previous_state_;
278 }; 281 };
279 282
280 } // namespace blink 283 } // namespace blink
281 284
282 #endif // ResourceFetcher_h 285 #endif // ResourceFetcher_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698