| OLD | NEW |
| 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 "SkOncePtr.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 } | 71 } |
| 72 | 72 |
| 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 void SkData::DummyReleaseProc(const void*, void*) {} |
| 82 |
| 81 /////////////////////////////////////////////////////////////////////////////// | 83 /////////////////////////////////////////////////////////////////////////////// |
| 82 | 84 |
| 83 SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty); | 85 SK_DECLARE_STATIC_ONCE_PTR(SkData, gEmpty); |
| 84 sk_sp<SkData> SkData::MakeEmpty() { | 86 sk_sp<SkData> SkData::MakeEmpty() { |
| 85 SkData* data = SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nu
llptr); })); | 87 SkData* data = SkRef(gEmpty.get([]{return new SkData(nullptr, 0, nullptr, nu
llptr); })); |
| 86 return sk_sp<SkData>(data); | 88 return sk_sp<SkData>(data); |
| 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*) { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |