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

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

Issue 239993006: Revert of Add flipped gradient branch to two point conical gradient (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 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 | « no previous file | src/effects/gradients/SkGradientShader.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 2007 The Android Open Source Project 3 * Copyright 2007 The Android Open Source Project
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 9
10 #ifndef SkPicture_DEFINED 10 #ifndef SkPicture_DEFINED
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // V14: Add flags word to PathRef serialization 315 // V14: Add flags word to PathRef serialization
316 // V15: Remove A1 bitmap config (and renumber remaining configs) 316 // V15: Remove A1 bitmap config (and renumber remaining configs)
317 // V16: Move SkPath's isOval flag to SkPathRef 317 // V16: Move SkPath's isOval flag to SkPathRef
318 // V17: SkPixelRef now writes SkImageInfo 318 // V17: SkPixelRef now writes SkImageInfo
319 // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. 319 // V18: SkBitmap now records x,y for its pixelref origin, instead of offset.
320 // V19: encode matrices and regions into the ops stream 320 // V19: encode matrices and regions into the ops stream
321 // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu re serialization) 321 // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu re serialization)
322 // V21: add pushCull, popCull 322 // V21: add pushCull, popCull
323 // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes 323 // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes
324 // V23: SkPaint::FilterLevel became a real enum 324 // V23: SkPaint::FilterLevel became a real enum
325 // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin g
326 325
327 // Note: If the picture version needs to be increased then please follow the 326 // Note: If the picture version needs to be increased then please follow the
328 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g l/qATVcw 327 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g l/qATVcw
329 328
330 // Only SKPs within the min/current picture version range (inclusive) can be read. 329 // Only SKPs within the min/current picture version range (inclusive) can be read.
331 static const uint32_t MIN_PICTURE_VERSION = 19; 330 static const uint32_t MIN_PICTURE_VERSION = 19;
332 static const uint32_t CURRENT_PICTURE_VERSION = 24; 331 static const uint32_t CURRENT_PICTURE_VERSION = 23;
333 332
334 mutable uint32_t fUniqueID; 333 mutable uint32_t fUniqueID;
335 334
336 // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class es to 335 // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class es to
337 // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv ed 336 // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv ed
338 // recorders and set the picture size 337 // recorders and set the picture size
339 SkPicturePlayback* fPlayback; 338 SkPicturePlayback* fPlayback;
340 SkPictureRecord* fRecord; 339 SkPictureRecord* fRecord;
341 int fWidth, fHeight; 340 int fWidth, fHeight;
342 const AccelData* fAccelData; 341 const AccelData* fAccelData;
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 } 488 }
490 489
491 private: 490 private:
492 SkAutoTUnref<SkPictureFactory> fFactory; 491 SkAutoTUnref<SkPictureFactory> fFactory;
493 SkAutoTUnref<SkPicture> fPicture; 492 SkAutoTUnref<SkPicture> fPicture;
494 493
495 typedef SkNoncopyable INHERITED; 494 typedef SkNoncopyable INHERITED;
496 }; 495 };
497 496
498 #endif 497 #endif
OLDNEW
« no previous file with comments | « no previous file | src/effects/gradients/SkGradientShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698