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

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

Issue 137433003: Convert SkWriter32 to use an SkTDArray for its internal storage. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: of course 0's fine too... Created 6 years, 11 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/SkOrderedWriteBuffer.h ('k') | src/core/SkPaint.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 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 8
9 #include "SkOrderedWriteBuffer.h" 9 #include "SkOrderedWriteBuffer.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
11 #include "SkData.h" 11 #include "SkData.h"
12 #include "SkPixelRef.h" 12 #include "SkPixelRef.h"
13 #include "SkPtrRecorder.h" 13 #include "SkPtrRecorder.h"
14 #include "SkStream.h" 14 #include "SkStream.h"
15 #include "SkTypeface.h" 15 #include "SkTypeface.h"
16 16
17 SkOrderedWriteBuffer::SkOrderedWriteBuffer(size_t minSize) 17 SkOrderedWriteBuffer::SkOrderedWriteBuffer()
18 : INHERITED() 18 : INHERITED()
19 , fFactorySet(NULL) 19 , fFactorySet(NULL)
20 , fNamedFactorySet(NULL) 20 , fNamedFactorySet(NULL)
21 , fWriter(minSize)
22 , fBitmapHeap(NULL) 21 , fBitmapHeap(NULL)
23 , fTFSet(NULL) 22 , fTFSet(NULL)
24 , fBitmapEncoder(NULL) { 23 , fBitmapEncoder(NULL) {
25 } 24 }
26 25
27 SkOrderedWriteBuffer::SkOrderedWriteBuffer(size_t minSize, void* storage, size_t storageSize) 26 SkOrderedWriteBuffer::SkOrderedWriteBuffer(void* storage, size_t storageSize)
28 : INHERITED() 27 : INHERITED()
29 , fFactorySet(NULL) 28 , fFactorySet(NULL)
30 , fNamedFactorySet(NULL) 29 , fNamedFactorySet(NULL)
31 , fWriter(minSize, storage, storageSize) 30 , fWriter(storage, storageSize)
32 , fBitmapHeap(NULL) 31 , fBitmapHeap(NULL)
33 , fTFSet(NULL) 32 , fTFSet(NULL)
34 , fBitmapEncoder(NULL) { 33 , fBitmapEncoder(NULL) {
35 } 34 }
36 35
37 SkOrderedWriteBuffer::~SkOrderedWriteBuffer() { 36 SkOrderedWriteBuffer::~SkOrderedWriteBuffer() {
38 SkSafeUnref(fFactorySet); 37 SkSafeUnref(fFactorySet);
39 SkSafeUnref(fNamedFactorySet); 38 SkSafeUnref(fNamedFactorySet);
40 SkSafeUnref(fBitmapHeap); 39 SkSafeUnref(fBitmapHeap);
41 SkSafeUnref(fTFSet); 40 SkSafeUnref(fTFSet);
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 // make room for the size of the flattened object 316 // make room for the size of the flattened object
318 (void)fWriter.reserve(sizeof(uint32_t)); 317 (void)fWriter.reserve(sizeof(uint32_t));
319 // record the current size, so we can subtract after the object writes. 318 // record the current size, so we can subtract after the object writes.
320 uint32_t offset = fWriter.bytesWritten(); 319 uint32_t offset = fWriter.bytesWritten();
321 // now flatten the object 320 // now flatten the object
322 flattenObject(flattenable, *this); 321 flattenObject(flattenable, *this);
323 uint32_t objSize = fWriter.bytesWritten() - offset; 322 uint32_t objSize = fWriter.bytesWritten() - offset;
324 // record the obj's size 323 // record the obj's size
325 *fWriter.peek32(offset - sizeof(uint32_t)) = objSize; 324 *fWriter.peek32(offset - sizeof(uint32_t)) = objSize;
326 } 325 }
OLDNEW
« no previous file with comments | « src/core/SkOrderedWriteBuffer.h ('k') | src/core/SkPaint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698