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

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

Issue 439223005: Resources restored from CSS cache should be able to trigger InsecureContent messages (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Avoid unnecessary notifications/checks Created 6 years, 3 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 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 #if !ENABLE(OILPAN) 158 #if !ENABLE(OILPAN)
159 virtual void refResourceLoaderHost() OVERRIDE; 159 virtual void refResourceLoaderHost() OVERRIDE;
160 virtual void derefResourceLoaderHost() OVERRIDE; 160 virtual void derefResourceLoaderHost() OVERRIDE;
161 #endif 161 #endif
162 162
163 enum ResourceLoadStartType { 163 enum ResourceLoadStartType {
164 ResourceLoadingFromNetwork, 164 ResourceLoadingFromNetwork,
165 ResourceLoadingFromCache 165 ResourceLoadingFromCache
166 }; 166 };
167 void maybeNotifyInsecureContent(const Resource*) const;
167 void requestLoadStarted(Resource*, const FetchRequest&, ResourceLoadStartTyp e); 168 void requestLoadStarted(Resource*, const FetchRequest&, ResourceLoadStartTyp e);
168 static const ResourceLoaderOptions& defaultResourceOptions(); 169 static const ResourceLoaderOptions& defaultResourceOptions();
169 private: 170 private:
170 171
171 explicit ResourceFetcher(DocumentLoader*); 172 explicit ResourceFetcher(DocumentLoader*);
172 173
173 bool shouldLoadNewResource(Resource::Type) const; 174 bool shouldLoadNewResource(Resource::Type) const;
174 175
175 ResourcePtr<Resource> requestResource(Resource::Type, FetchRequest&); 176 ResourcePtr<Resource> requestResource(Resource::Type, FetchRequest&);
176 ResourcePtr<Resource> createResourceForRevalidation(const FetchRequest&, Res ource*); 177 ResourcePtr<Resource> createResourceForRevalidation(const FetchRequest&, Res ource*);
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 m_loader->m_allowStaleResources = m_previousState; 266 m_loader->m_allowStaleResources = m_previousState;
266 } 267 }
267 private: 268 private:
268 ResourceFetcher* m_loader; 269 ResourceFetcher* m_loader;
269 bool m_previousState; 270 bool m_previousState;
270 }; 271 };
271 272
272 } // namespace blink 273 } // namespace blink
273 274
274 #endif 275 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698