| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 if (inCache() && m_inLiveDecodedResourcesList && cacheLiveResourcePriority()
!= static_cast<unsigned>(priority)) { | 425 if (inCache() && m_inLiveDecodedResourcesList && cacheLiveResourcePriority()
!= static_cast<unsigned>(priority)) { |
| 426 memoryCache()->removeFromLiveDecodedResourcesList(this); | 426 memoryCache()->removeFromLiveDecodedResourcesList(this); |
| 427 m_cacheLiveResourcePriority = priority; | 427 m_cacheLiveResourcePriority = priority; |
| 428 memoryCache()->insertInLiveDecodedResourcesList(this); | 428 memoryCache()->insertInLiveDecodedResourcesList(this); |
| 429 memoryCache()->prune(); | 429 memoryCache()->prune(); |
| 430 } | 430 } |
| 431 } | 431 } |
| 432 | 432 |
| 433 void Resource::clearLoader() | 433 void Resource::clearLoader() |
| 434 { | 434 { |
| 435 m_loader = 0; | 435 m_loader = nullptr; |
| 436 } | 436 } |
| 437 | 437 |
| 438 void Resource::addClient(ResourceClient* client) | 438 void Resource::addClient(ResourceClient* client) |
| 439 { | 439 { |
| 440 if (addClientToSet(client)) | 440 if (addClientToSet(client)) |
| 441 didAddClient(client); | 441 didAddClient(client); |
| 442 } | 442 } |
| 443 | 443 |
| 444 void Resource::didAddClient(ResourceClient* c) | 444 void Resource::didAddClient(ResourceClient* c) |
| 445 { | 445 { |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1003 return "Shader"; | 1003 return "Shader"; |
| 1004 case Resource::ImportResource: | 1004 case Resource::ImportResource: |
| 1005 return "ImportResource"; | 1005 return "ImportResource"; |
| 1006 } | 1006 } |
| 1007 ASSERT_NOT_REACHED(); | 1007 ASSERT_NOT_REACHED(); |
| 1008 return "Unknown"; | 1008 return "Unknown"; |
| 1009 } | 1009 } |
| 1010 #endif // !LOG_DISABLED | 1010 #endif // !LOG_DISABLED |
| 1011 | 1011 |
| 1012 } | 1012 } |
| OLD | NEW |