| 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 156 |
| 157 #if !ENABLE(OILPAN) | 157 #if !ENABLE(OILPAN) |
| 158 virtual void refResourceLoaderHost() OVERRIDE; | 158 virtual void refResourceLoaderHost() OVERRIDE; |
| 159 virtual void derefResourceLoaderHost() OVERRIDE; | 159 virtual void derefResourceLoaderHost() OVERRIDE; |
| 160 #endif | 160 #endif |
| 161 | 161 |
| 162 enum ResourceLoadStartType { | 162 enum ResourceLoadStartType { |
| 163 ResourceLoadingFromNetwork, | 163 ResourceLoadingFromNetwork, |
| 164 ResourceLoadingFromCache | 164 ResourceLoadingFromCache |
| 165 }; | 165 }; |
| 166 void maybeNotifyInsecureContent(const Resource*) const; |
| 166 void requestLoadStarted(Resource*, const FetchRequest&, ResourceLoadStartTyp
e); | 167 void requestLoadStarted(Resource*, const FetchRequest&, ResourceLoadStartTyp
e); |
| 167 static const ResourceLoaderOptions& defaultResourceOptions(); | 168 static const ResourceLoaderOptions& defaultResourceOptions(); |
| 168 private: | 169 private: |
| 169 | 170 |
| 170 explicit ResourceFetcher(DocumentLoader*); | 171 explicit ResourceFetcher(DocumentLoader*); |
| 171 | 172 |
| 172 bool shouldLoadNewResource(Resource::Type) const; | 173 bool shouldLoadNewResource(Resource::Type) const; |
| 173 | 174 |
| 174 ResourcePtr<Resource> requestResource(Resource::Type, FetchRequest&); | 175 ResourcePtr<Resource> requestResource(Resource::Type, FetchRequest&); |
| 175 ResourcePtr<Resource> createResourceForRevalidation(const FetchRequest&, Res
ource*); | 176 ResourcePtr<Resource> createResourceForRevalidation(const FetchRequest&, Res
ource*); |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 m_loader->m_allowStaleResources = m_previousState; | 264 m_loader->m_allowStaleResources = m_previousState; |
| 264 } | 265 } |
| 265 private: | 266 private: |
| 266 ResourceFetcher* m_loader; | 267 ResourceFetcher* m_loader; |
| 267 bool m_previousState; | 268 bool m_previousState; |
| 268 }; | 269 }; |
| 269 | 270 |
| 270 } // namespace blink | 271 } // namespace blink |
| 271 | 272 |
| 272 #endif | 273 #endif |
| OLD | NEW |