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

Side by Side Diff: src/core/SkYUVPlanesCache.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 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
« no previous file with comments | « src/core/SkYUVPlanesCache.h ('k') | src/device/xps/SkXPSDevice.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBitmapCache.h" 8 #include "SkBitmapCache.h"
9 #include "SkResourceCache.h" 9 #include "SkResourceCache.h"
10 #include "SkYUVPlanesCache.h" 10 #include "SkYUVPlanesCache.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 SkDiscardableMemory* diagnostic_only_getDiscardable() const override { 52 SkDiscardableMemory* diagnostic_only_getDiscardable() const override {
53 return fValue.fData->diagnostic_only_getDiscardable(); 53 return fValue.fData->diagnostic_only_getDiscardable();
54 } 54 }
55 55
56 static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) { 56 static bool Visitor(const SkResourceCache::Rec& baseRec, void* contextData) {
57 const YUVPlanesRec& rec = static_cast<const YUVPlanesRec&>(baseRec); 57 const YUVPlanesRec& rec = static_cast<const YUVPlanesRec&>(baseRec);
58 YUVValue* result = static_cast<YUVValue*>(contextData); 58 YUVValue* result = static_cast<YUVValue*>(contextData);
59 59
60 SkCachedData* tmpData = rec.fValue.fData; 60 SkCachedData* tmpData = rec.fValue.fData;
61 tmpData->ref(); 61 tmpData->ref();
62 if (NULL == tmpData->data()) { 62 if (nullptr == tmpData->data()) {
63 tmpData->unref(); 63 tmpData->unref();
64 return false; 64 return false;
65 } 65 }
66 result->fData = tmpData; 66 result->fData = tmpData;
67 result->fInfo = rec.fValue.fInfo; 67 result->fInfo = rec.fValue.fInfo;
68 return true; 68 return true;
69 } 69 }
70 }; 70 };
71 } // namespace 71 } // namespace
72 72
73 SkCachedData* SkYUVPlanesCache::FindAndRef(uint32_t genID, Info* info, 73 SkCachedData* SkYUVPlanesCache::FindAndRef(uint32_t genID, Info* info,
74 SkResourceCache* localCache) { 74 SkResourceCache* localCache) {
75 YUVValue result; 75 YUVValue result;
76 YUVPlanesKey key(genID); 76 YUVPlanesKey key(genID);
77 if (!CHECK_LOCAL(localCache, find, Find, key, YUVPlanesRec::Visitor, &result )) { 77 if (!CHECK_LOCAL(localCache, find, Find, key, YUVPlanesRec::Visitor, &result )) {
78 return NULL; 78 return nullptr;
79 } 79 }
80 80
81 *info = result.fInfo; 81 *info = result.fInfo;
82 return result.fData; 82 return result.fData;
83 } 83 }
84 84
85 void SkYUVPlanesCache::Add(uint32_t genID, SkCachedData* data, Info* info, 85 void SkYUVPlanesCache::Add(uint32_t genID, SkCachedData* data, Info* info,
86 SkResourceCache* localCache) { 86 SkResourceCache* localCache) {
87 YUVPlanesKey key(genID); 87 YUVPlanesKey key(genID);
88 return CHECK_LOCAL(localCache, add, Add, new YUVPlanesRec(key, data, info)); 88 return CHECK_LOCAL(localCache, add, Add, new YUVPlanesRec(key, data, info));
89 } 89 }
OLDNEW
« no previous file with comments | « src/core/SkYUVPlanesCache.h ('k') | src/device/xps/SkXPSDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698