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

Side by Side Diff: src/core/SkOrderedReadBuffer.h

Issue 14741007: Revert "Allow supporting 1 older PICTURE_VERSION." (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « include/core/SkPicture.h ('k') | src/core/SkOrderedReadBuffer.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 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 8
9 #ifndef SkOrderedReadBuffer_DEFINED 9 #ifndef SkOrderedReadBuffer_DEFINED
10 #define SkOrderedReadBuffer_DEFINED 10 #define SkOrderedReadBuffer_DEFINED
11 11
12 #include "SkRefCnt.h" 12 #include "SkRefCnt.h"
13 #include "SkBitmapHeap.h" 13 #include "SkBitmapHeap.h"
14 #include "SkFlattenableBuffers.h" 14 #include "SkFlattenableBuffers.h"
15 #include "SkPath.h" 15 #include "SkPath.h"
16 #include "SkPicture.h" 16 #include "SkPicture.h"
17 #include "SkReader32.h" 17 #include "SkReader32.h"
18 18
19 class SkBitmap; 19 class SkBitmap;
20 20
21 class SkOrderedReadBuffer : public SkFlattenableReadBuffer { 21 class SkOrderedReadBuffer : public SkFlattenableReadBuffer {
22 public: 22 public:
23 SkOrderedReadBuffer(); 23 SkOrderedReadBuffer();
24 SkOrderedReadBuffer(const void* data, size_t size); 24 SkOrderedReadBuffer(const void* data, size_t size);
25 SkOrderedReadBuffer(SkStream* stream); 25 SkOrderedReadBuffer(SkStream* stream);
26 virtual ~SkOrderedReadBuffer(); 26 virtual ~SkOrderedReadBuffer();
27 27
28 virtual SkOrderedReadBuffer* getOrderedBinaryBuffer() SK_OVERRIDE { return t his; } 28 virtual SkOrderedReadBuffer* getOrderedBinaryBuffer() SK_OVERRIDE { return t his; }
29 29
30 void setPictureVersion(uint32_t version);
31
32 SkReader32* getReader32() { return &fReader; } 30 SkReader32* getReader32() { return &fReader; }
33 31
34 uint32_t size() { return fReader.size(); } 32 uint32_t size() { return fReader.size(); }
35 uint32_t offset() { return fReader.offset(); } 33 uint32_t offset() { return fReader.offset(); }
36 bool eof() { return fReader.eof(); } 34 bool eof() { return fReader.eof(); }
37 const void* skip(size_t size) { return fReader.skip(size); } 35 const void* skip(size_t size) { return fReader.skip(size); }
38 36
39 // primitives 37 // primitives
40 virtual bool readBool() SK_OVERRIDE; 38 virtual bool readBool() SK_OVERRIDE;
41 virtual SkColor readColor() SK_OVERRIDE; 39 virtual SkColor readColor() SK_OVERRIDE;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 114
117 SkBitmapHeapReader* fBitmapStorage; 115 SkBitmapHeapReader* fBitmapStorage;
118 SkTypeface** fTFArray; 116 SkTypeface** fTFArray;
119 int fTFCount; 117 int fTFCount;
120 118
121 SkTDArray<SkFlattenable::Factory>* fFactoryTDArray; 119 SkTDArray<SkFlattenable::Factory>* fFactoryTDArray;
122 SkFlattenable::Factory* fFactoryArray; 120 SkFlattenable::Factory* fFactoryArray;
123 int fFactoryCount; 121 int fFactoryCount;
124 122
125 SkPicture::InstallPixelRefProc fBitmapDecoder; 123 SkPicture::InstallPixelRefProc fBitmapDecoder;
126 uint32_t fPictureVersion;
127 124
128 typedef SkFlattenableReadBuffer INHERITED; 125 typedef SkFlattenableReadBuffer INHERITED;
129 }; 126 };
130 127
131 #endif // SkOrderedReadBuffer_DEFINED 128 #endif // SkOrderedReadBuffer_DEFINED
OLDNEW
« no previous file with comments | « include/core/SkPicture.h ('k') | src/core/SkOrderedReadBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698