OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "SkDataPixelRef.h" | 8 #include "SkDataPixelRef.h" |
9 #include "SkData.h" | 9 #include "SkData.h" |
10 #include "SkFlattenableBuffers.h" | 10 #include "SkFlattenableBuffers.h" |
11 | 11 |
12 SkDataPixelRef::SkDataPixelRef(SkData* data) : fData(data) { | 12 SkDataPixelRef::SkDataPixelRef(const SkImageInfo& info, |
13 SkData* data, size_t rowBytes) | |
14 : fInfo(info) | |
15 , fData(data) | |
16 , fRB(rowBytes) | |
17 { | |
13 fData->ref(); | 18 fData->ref(); |
14 this->setPreLocked(const_cast<void*>(fData->data()), NULL); | 19 this->setPreLocked(const_cast<void*>(fData->data()), rowBytes, NULL); |
15 } | 20 } |
16 | 21 |
17 SkDataPixelRef::~SkDataPixelRef() { | 22 SkDataPixelRef::~SkDataPixelRef() { |
18 fData->unref(); | 23 fData->unref(); |
19 } | 24 } |
20 | 25 |
21 void* SkDataPixelRef::onLockPixels(SkColorTable** ct) { | 26 void* SkDataPixelRef::onLockPixels(SkImageInfo* info, size_t* rowBytes, |
27 SkColorTable** ct) { | |
28 *info = fInfo; | |
29 *rowBytes = fRB; | |
22 *ct = NULL; | 30 *ct = NULL; |
23 return const_cast<void*>(fData->data()); | 31 return const_cast<void*>(fData->data()); |
24 } | 32 } |
25 | 33 |
26 void SkDataPixelRef::onUnlockPixels() { | 34 void SkDataPixelRef::onUnlockPixels() { |
27 // nothing to do | 35 // nothing to do |
28 } | 36 } |
29 | 37 |
30 void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const { | 38 void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const { |
scroggo
2013/11/19 18:17:09
We need to flatten (and unflatten) fInfo.
reed1
2013/11/20 20:56:56
doh!
| |
31 this->INHERITED::flatten(buffer); | 39 this->INHERITED::flatten(buffer); |
40 | |
32 buffer.writeDataAsByteArray(fData); | 41 buffer.writeDataAsByteArray(fData); |
42 buffer.write32(fRB); | |
33 } | 43 } |
34 | 44 |
35 SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer) | 45 SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer) |
36 : INHERITED(buffer, NULL) { | 46 : INHERITED(buffer, NULL) { |
37 fData = buffer.readByteArrayAsData(); | 47 fData = buffer.readByteArrayAsData(); |
38 this->setPreLocked(const_cast<void*>(fData->data()), NULL); | 48 fRB = buffer.read32(); |
49 this->setPreLocked(const_cast<void*>(fData->data()), fRB, NULL); | |
39 } | 50 } |
OLD | NEW |