| 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) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 #ifndef NDEBUG | 146 #ifndef NDEBUG |
| 147 cachedResourceLeakCounter.decrement(); | 147 cachedResourceLeakCounter.decrement(); |
| 148 #endif | 148 #endif |
| 149 --s_instanceCount; | 149 --s_instanceCount; |
| 150 } | 150 } |
| 151 | 151 |
| 152 void Resource::dispose() | 152 void Resource::dispose() |
| 153 { | 153 { |
| 154 } | 154 } |
| 155 | 155 |
| 156 void Resource::trace(Visitor* visitor) | |
| 157 { | |
| 158 visitor->trace(m_loader); | |
| 159 visitor->trace(m_resourceToRevalidate); | |
| 160 visitor->trace(m_proxyResource); | |
| 161 } | |
| 162 | |
| 163 void Resource::failBeforeStarting() | 156 void Resource::failBeforeStarting() |
| 164 { | 157 { |
| 165 WTF_LOG(ResourceLoading, "Cannot start loading '%s'", url().string().latin1(
).data()); | 158 WTF_LOG(ResourceLoading, "Cannot start loading '%s'", url().string().latin1(
).data()); |
| 166 error(Resource::LoadError); | 159 error(Resource::LoadError); |
| 167 } | 160 } |
| 168 | 161 |
| 169 void Resource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& optio
ns) | 162 void Resource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& optio
ns) |
| 170 { | 163 { |
| 171 if (!fetcher->frame()) { | 164 if (!fetcher->frame()) { |
| 172 failBeforeStarting(); | 165 failBeforeStarting(); |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 return "ImportResource"; | 894 return "ImportResource"; |
| 902 case Resource::Media: | 895 case Resource::Media: |
| 903 return "Media"; | 896 return "Media"; |
| 904 } | 897 } |
| 905 ASSERT_NOT_REACHED(); | 898 ASSERT_NOT_REACHED(); |
| 906 return "Unknown"; | 899 return "Unknown"; |
| 907 } | 900 } |
| 908 #endif // !LOG_DISABLED | 901 #endif // !LOG_DISABLED |
| 909 | 902 |
| 910 } | 903 } |
| OLD | NEW |