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

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

Issue 1953533002: SkOncePtr -> SkOnce (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: hide sk_num_cores() Created 4 years, 7 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/SkColorSpace.cpp ('k') | src/core/SkFontMgr.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 2011 Google Inc. 2 * Copyright 2011 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 "SkData.h" 8 #include "SkData.h"
9 #include "SkOSFile.h" 9 #include "SkOSFile.h"
10 #include "SkOncePtr.h" 10 #include "SkOnce.h"
11 #include "SkReadBuffer.h" 11 #include "SkReadBuffer.h"
12 #include "SkStream.h" 12 #include "SkStream.h"
13 #include "SkWriteBuffer.h" 13 #include "SkWriteBuffer.h"
14 14
15 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) { 15 SkData::SkData(const void* ptr, size_t size, ReleaseProc proc, void* context) {
16 fPtr = const_cast<void*>(ptr); 16 fPtr = const_cast<void*>(ptr);
17 fSize = size; 17 fSize = size;
18 fReleaseProc = proc; 18 fReleaseProc = proc;
19 fReleaseProcContext = context; 19 fReleaseProcContext = context;
20 } 20 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 char* storage = (char*)sk_malloc_throw(actualLength); 73 char* storage = (char*)sk_malloc_throw(actualLength);
74 SkData* data = new (storage) SkData(length); 74 SkData* data = new (storage) SkData(length);
75 if (srcOrNull) { 75 if (srcOrNull) {
76 memcpy(data->writable_data(), srcOrNull, length); 76 memcpy(data->writable_data(), srcOrNull, length);
77 } 77 }
78 return sk_sp<SkData>(data); 78 return sk_sp<SkData>(data);
79 } 79 }
80 80
81 /////////////////////////////////////////////////////////////////////////////// 81 ///////////////////////////////////////////////////////////////////////////////
82 82
83 SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty);
84 sk_sp<SkData> SkData::MakeEmpty() { 83 sk_sp<SkData> SkData::MakeEmpty() {
85 SkData* data = SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nu llptr); })); 84 static SkOnce once;
86 return sk_sp<SkData>(data); 85 static SkData* empty;
86
87 once([]{ empty = new SkData(nullptr, 0, nullptr, nullptr); });
88 return sk_ref_sp(empty);
87 } 89 }
88 90
89 // assumes fPtr was allocated via sk_malloc 91 // assumes fPtr was allocated via sk_malloc
90 static void sk_free_releaseproc(const void* ptr, void*) { 92 static void sk_free_releaseproc(const void* ptr, void*) {
91 sk_free((void*)ptr); 93 sk_free((void*)ptr);
92 } 94 }
93 95
94 sk_sp<SkData> SkData::MakeFromMalloc(const void* data, size_t length) { 96 sk_sp<SkData> SkData::MakeFromMalloc(const void* data, size_t length) {
95 return sk_sp<SkData>(new SkData(data, length, sk_free_releaseproc, nullptr)) ; 97 return sk_sp<SkData>(new SkData(data, length, sk_free_releaseproc, nullptr)) ;
96 } 98 }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 187
186 /////////////////////////////////////////////////////////////////////////////// 188 ///////////////////////////////////////////////////////////////////////////////
187 189
188 sk_sp<SkData> SkData::MakeFromStream(SkStream* stream, size_t size) { 190 sk_sp<SkData> SkData::MakeFromStream(SkStream* stream, size_t size) {
189 sk_sp<SkData> data(SkData::MakeUninitialized(size)); 191 sk_sp<SkData> data(SkData::MakeUninitialized(size));
190 if (stream->read(data->writable_data(), size) != size) { 192 if (stream->read(data->writable_data(), size) != size) {
191 return nullptr; 193 return nullptr;
192 } 194 }
193 return data; 195 return data;
194 } 196 }
OLDNEW
« no previous file with comments | « src/core/SkColorSpace.cpp ('k') | src/core/SkFontMgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698