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

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

Issue 37803002: Adding size parameter to read array functions (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fixed comments Created 7 years, 1 month 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
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SkMallocPixelRef.h" 8 #include "SkMallocPixelRef.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkFlattenableBuffers.h" 10 #include "SkFlattenableBuffers.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 buffer.writeBool(fCTable != NULL); 47 buffer.writeBool(fCTable != NULL);
48 if (fCTable) { 48 if (fCTable) {
49 fCTable->writeToBuffer(buffer); 49 fCTable->writeToBuffer(buffer);
50 } 50 }
51 } 51 }
52 52
53 SkMallocPixelRef::SkMallocPixelRef(SkFlattenableReadBuffer& buffer) 53 SkMallocPixelRef::SkMallocPixelRef(SkFlattenableReadBuffer& buffer)
54 : INHERITED(buffer, NULL) { 54 : INHERITED(buffer, NULL) {
55 fSize = buffer.getArrayCount(); 55 fSize = buffer.getArrayCount();
56 fStorage = sk_malloc_throw(fSize); 56 fStorage = sk_malloc_throw(fSize);
57 buffer.readByteArray(fStorage); 57 buffer.readByteArray(fStorage, fSize);
58 if (buffer.readBool()) { 58 if (buffer.readBool()) {
59 fCTable = SkNEW_ARGS(SkColorTable, (buffer)); 59 fCTable = SkNEW_ARGS(SkColorTable, (buffer));
60 } else { 60 } else {
61 fCTable = NULL; 61 fCTable = NULL;
62 } 62 }
63 fOwnPixels = true; 63 fOwnPixels = true;
64 64
65 this->setPreLocked(fStorage, fCTable); 65 this->setPreLocked(fStorage, fCTable);
66 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698