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

Side by Side Diff: include/core/SkPicture.h

Issue 1199473002: change old picture serialization to really handle images (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright 2007 The Android Open Source Project 2 * Copyright 2007 The Android Open Source Project
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 #ifndef SkPicture_DEFINED 8 #ifndef SkPicture_DEFINED
9 #define SkPicture_DEFINED 9 #define SkPicture_DEFINED
10 10
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 friend struct SkPathCounter; 168 friend struct SkPathCounter;
169 169
170 // V35: Store SkRect (rather then width & height) in header 170 // V35: Store SkRect (rather then width & height) in header
171 // V36: Remove (obsolete) alphatype from SkColorTable 171 // V36: Remove (obsolete) alphatype from SkColorTable
172 // V37: Added shadow only option to SkDropShadowImageFilter (last version to record CLEAR) 172 // V37: Added shadow only option to SkDropShadowImageFilter (last version to record CLEAR)
173 // V38: Added PictureResolution option to SkPictureImageFilter 173 // V38: Added PictureResolution option to SkPictureImageFilter
174 // V39: Added FilterLevel option to SkPictureImageFilter 174 // V39: Added FilterLevel option to SkPictureImageFilter
175 // V40: Remove UniqueID serialization from SkImageFilter. 175 // V40: Remove UniqueID serialization from SkImageFilter.
176 // V41: Added serialization of SkBitmapSource's filterQuality parameter 176 // V41: Added serialization of SkBitmapSource's filterQuality parameter
177 // V42: Added a bool to SkPictureShader serialization to indicate did-we-ser ialize-a-picture? 177 // V42: Added a bool to SkPictureShader serialization to indicate did-we-ser ialize-a-picture?
178 // V43: Added DRAW_IMAGE and DRAW_IMAGE_RECT opt codes to serialized data
178 179
179 // Only SKPs within the min/current picture version range (inclusive) can be read. 180 // Only SKPs within the min/current picture version range (inclusive) can be read.
180 static const uint32_t MIN_PICTURE_VERSION = 35; // Produced by Chrom e M39. 181 static const uint32_t MIN_PICTURE_VERSION = 35; // Produced by Chrom e M39.
181 static const uint32_t CURRENT_PICTURE_VERSION = 42; 182 static const uint32_t CURRENT_PICTURE_VERSION = 43;
182 183
183 static_assert(MIN_PICTURE_VERSION <= 41, 184 static_assert(MIN_PICTURE_VERSION <= 41,
184 "Remove kFontFileName and related code from SkFontDescriptor.c pp."); 185 "Remove kFontFileName and related code from SkFontDescriptor.c pp.");
185 186
186 static_assert(MIN_PICTURE_VERSION <= 42, 187 static_assert(MIN_PICTURE_VERSION <= 42,
187 "Remove COMMENT API handlers from SkPicturePlayback.cpp"); 188 "Remove COMMENT API handlers from SkPicturePlayback.cpp");
188 189
189 static bool IsValidPictInfo(const SkPictInfo& info); 190 static bool IsValidPictInfo(const SkPictInfo& info);
190 static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*); 191 static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
191 192
192 SkPictInfo createHeader() const; 193 SkPictInfo createHeader() const;
193 SkPictureData* backport() const; 194 SkPictureData* backport() const;
194 195
195 mutable uint32_t fUniqueID; 196 mutable uint32_t fUniqueID;
196 }; 197 };
197 198
198 #endif 199 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698