Chromium Code Reviews| 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 | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 7 rights reserved. | 7 rights reserved. |
| 8 | 8 |
| 9 This library is free software; you can redistribute it and/or | 9 This library is free software; you can redistribute it and/or |
| 10 modify it under the terms of the GNU Library General Public | 10 modify it under the terms of the GNU Library General Public |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 294 void Resource::ResourceCallback::runTask() { | 294 void Resource::ResourceCallback::runTask() { |
| 295 HeapVector<Member<Resource>> resources; | 295 HeapVector<Member<Resource>> resources; |
| 296 for (const Member<Resource>& resource : m_resourcesWithPendingClients) | 296 for (const Member<Resource>& resource : m_resourcesWithPendingClients) |
| 297 resources.append(resource.get()); | 297 resources.append(resource.get()); |
| 298 m_resourcesWithPendingClients.clear(); | 298 m_resourcesWithPendingClients.clear(); |
| 299 | 299 |
| 300 for (const auto& resource : resources) | 300 for (const auto& resource : resources) |
| 301 resource->finishPendingClients(); | 301 resource->finishPendingClients(); |
| 302 } | 302 } |
| 303 | 303 |
| 304 constexpr Resource::Status Resource::NotStarted; | |
|
yhirano
2016/12/08 04:45:26
I don't understand why these are needed. A static
hiroshige
2016/12/08 10:07:39
I also thought so but the compile failed on Linux
yhirano
2016/12/09 08:40:05
yutak@ told me that an "odr-used" variable should
| |
| 305 constexpr Resource::Status Resource::Pending; | |
| 306 constexpr Resource::Status Resource::Cached; | |
| 307 constexpr Resource::Status Resource::LoadError; | |
| 308 constexpr Resource::Status Resource::DecodeError; | |
| 309 | |
| 304 Resource::Resource(const ResourceRequest& request, | 310 Resource::Resource(const ResourceRequest& request, |
| 305 Type type, | 311 Type type, |
| 306 const ResourceLoaderOptions& options) | 312 const ResourceLoaderOptions& options) |
| 307 : m_loadFinishTime(0), | 313 : m_loadFinishTime(0), |
| 308 m_identifier(0), | 314 m_identifier(0), |
| 309 m_encodedSize(0), | 315 m_encodedSize(0), |
| 310 m_encodedSizeMemoryUsage(0), | 316 m_encodedSizeMemoryUsage(0), |
| 311 m_decodedSize(0), | 317 m_decodedSize(0), |
| 312 m_overheadSize(calculateOverheadSize()), | 318 m_overheadSize(calculateOverheadSize()), |
| 313 m_preloadCount(0), | 319 m_preloadCount(0), |
| (...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1099 case Resource::TextTrack: | 1105 case Resource::TextTrack: |
| 1100 case Resource::Media: | 1106 case Resource::Media: |
| 1101 case Resource::Manifest: | 1107 case Resource::Manifest: |
| 1102 return false; | 1108 return false; |
| 1103 } | 1109 } |
| 1104 NOTREACHED(); | 1110 NOTREACHED(); |
| 1105 return false; | 1111 return false; |
| 1106 } | 1112 } |
| 1107 | 1113 |
| 1108 } // namespace blink | 1114 } // namespace blink |
| OLD | NEW |