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

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

Issue 248033003: Remove support for inheriting the paint color from SkColorShader (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fColor -> color 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 | Annotate | Revision Log
« no previous file with comments | « include/core/SkColorShader.h ('k') | src/core/SkBlitter.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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 // V16: Move SkPath's isOval flag to SkPathRef 319 // V16: Move SkPath's isOval flag to SkPathRef
320 // V17: SkPixelRef now writes SkImageInfo 320 // V17: SkPixelRef now writes SkImageInfo
321 // V18: SkBitmap now records x,y for its pixelref origin, instead of offset. 321 // V18: SkBitmap now records x,y for its pixelref origin, instead of offset.
322 // V19: encode matrices and regions into the ops stream 322 // V19: encode matrices and regions into the ops stream
323 // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu re serialization) 323 // V20: added bool to SkPictureImageFilter's serialization (to allow SkPictu re serialization)
324 // V21: add pushCull, popCull 324 // V21: add pushCull, popCull
325 // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes 325 // V22: SK_PICT_FACTORY_TAG's size is now the chunk size in bytes
326 // V23: SkPaint::FilterLevel became a real enum 326 // V23: SkPaint::FilterLevel became a real enum
327 // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin g 327 // V24: SkTwoPointConicalGradient now has fFlipped flag for gradient flippin g
328 // V25: SkDashPathEffect now only writes phase and interval array when flatt ening 328 // V25: SkDashPathEffect now only writes phase and interval array when flatt ening
329 // V26: Removed boolean from SkColorShader for inheriting color from SkPaint .
329 330
330 // Note: If the picture version needs to be increased then please follow the 331 // Note: If the picture version needs to be increased then please follow the
331 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g l/qATVcw 332 // steps to generate new SKPs in (only accessible to Googlers): http://goo.g l/qATVcw
332 333
333 // Only SKPs within the min/current picture version range (inclusive) can be read. 334 // Only SKPs within the min/current picture version range (inclusive) can be read.
334 static const uint32_t MIN_PICTURE_VERSION = 19; 335 static const uint32_t MIN_PICTURE_VERSION = 19;
335 static const uint32_t CURRENT_PICTURE_VERSION = 25; 336 static const uint32_t CURRENT_PICTURE_VERSION = 26;
336 337
337 mutable uint32_t fUniqueID; 338 mutable uint32_t fUniqueID;
338 339
339 // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class es to 340 // fPlayback, fRecord, fWidth & fHeight are protected to allow derived class es to
340 // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv ed 341 // install their own SkPicturePlayback-derived players,SkPictureRecord-deriv ed
341 // recorders and set the picture size 342 // recorders and set the picture size
342 SkPicturePlayback* fPlayback; 343 SkPicturePlayback* fPlayback;
343 SkPictureRecord* fRecord; 344 SkPictureRecord* fRecord;
344 int fWidth, fHeight; 345 int fWidth, fHeight;
345 const AccelData* fAccelData; 346 const AccelData* fAccelData;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 typedef SkRefCnt INHERITED; 453 typedef SkRefCnt INHERITED;
453 }; 454 };
454 455
455 #endif 456 #endif
456 457
457 #ifdef SK_SUPPORT_LEGACY_PICTURE_HEADERS 458 #ifdef SK_SUPPORT_LEGACY_PICTURE_HEADERS
458 #include "SkPictureRecorder.h" 459 #include "SkPictureRecorder.h"
459 #endif 460 #endif
460 461
461 #endif 462 #endif
OLDNEW
« no previous file with comments | « include/core/SkColorShader.h ('k') | src/core/SkBlitter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698