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

Side by Side Diff: src/image/SkDataPixelRef.cpp

Issue 110503003: PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bit… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « src/image/SkDataPixelRef.h ('k') | src/image/SkImage_Raster.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 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 : INHERITED(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 bool SkDataPixelRef::onNewLockPixels(LockRec* rec) {
22 *ct = NULL; 27 rec->fPixels = const_cast<void*>(fData->data());
23 return const_cast<void*>(fData->data()); 28 rec->fColorTable = NULL;
29 rec->fRowBytes = fRB;
30 return true;
24 } 31 }
25 32
26 void SkDataPixelRef::onUnlockPixels() { 33 void SkDataPixelRef::onUnlockPixels() {
27 // nothing to do 34 // nothing to do
28 } 35 }
29 36
30 size_t SkDataPixelRef::getAllocatedSizeInBytes() const { 37 size_t SkDataPixelRef::getAllocatedSizeInBytes() const {
31 return fData ? fData->size() : 0; 38 return fData ? fData->size() : 0;
32 } 39 }
33 40
34 void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const { 41 void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const {
35 this->INHERITED::flatten(buffer); 42 this->INHERITED::flatten(buffer);
43
36 buffer.writeDataAsByteArray(fData); 44 buffer.writeDataAsByteArray(fData);
45 buffer.write32(fRB);
37 } 46 }
38 47
39 SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer) 48 SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer)
40 : INHERITED(buffer, NULL) { 49 : INHERITED(buffer, NULL)
50 {
41 fData = buffer.readByteArrayAsData(); 51 fData = buffer.readByteArrayAsData();
42 this->setPreLocked(const_cast<void*>(fData->data()), NULL); 52 fRB = buffer.read32();
53 this->setPreLocked(const_cast<void*>(fData->data()), fRB, NULL);
43 } 54 }
OLDNEW
« no previous file with comments | « src/image/SkDataPixelRef.h ('k') | src/image/SkImage_Raster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698