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

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

Issue 51033004: add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month 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/SkDevice.h ('k') | include/core/SkPath.h » ('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 /* 3 /*
4 * Copyright 2006 The Android Open Source Project 4 * Copyright 2006 The Android Open Source Project
5 * 5 *
6 * Use of this source code is governed by a BSD-style license that can be 6 * Use of this source code is governed by a BSD-style license that can be
7 * found in the LICENSE file. 7 * found in the LICENSE file.
8 */ 8 */
9 9
10 10
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 */ 297 */
298 FilterLevel getFilterLevel() const; 298 FilterLevel getFilterLevel() const;
299 299
300 /** 300 /**
301 * Set the filter level. This affects the quality (and performance) of 301 * Set the filter level. This affects the quality (and performance) of
302 * drawing scaled images. 302 * drawing scaled images.
303 */ 303 */
304 void setFilterLevel(FilterLevel); 304 void setFilterLevel(FilterLevel);
305 305
306 /** 306 /**
307 * DEPRECATED: use setFilterLevel instead.
308 * If the predicate is true, set the filterLevel to Low, else set it to 307 * If the predicate is true, set the filterLevel to Low, else set it to
309 * None. 308 * None.
310 */ 309 */
310 SK_ATTR_DEPRECATED("use setFilterLevel")
311 void setFilterBitmap(bool doFilter) { 311 void setFilterBitmap(bool doFilter) {
312 this->setFilterLevel(doFilter ? kLow_FilterLevel : kNone_FilterLevel); 312 this->setFilterLevel(doFilter ? kLow_FilterLevel : kNone_FilterLevel);
313 } 313 }
314 314
315 /** 315 /**
316 * DEPRECATED: call getFilterLevel() instead.
317 * Returns true if getFilterLevel() returns anything other than None. 316 * Returns true if getFilterLevel() returns anything other than None.
318 */ 317 */
318 SK_ATTR_DEPRECATED("use getFilterLevel")
319 bool isFilterBitmap() const { 319 bool isFilterBitmap() const {
320 return kNone_FilterLevel != this->getFilterLevel(); 320 return kNone_FilterLevel != this->getFilterLevel();
321 } 321 }
322 322
323 /** Styles apply to rect, oval, path, and text. 323 /** Styles apply to rect, oval, path, and text.
324 Bitmaps are always drawn in "fill", and lines are always drawn in 324 Bitmaps are always drawn in "fill", and lines are always drawn in
325 "stroke". 325 "stroke".
326 326
327 Note: strokeandfill implicitly draws the result with 327 Note: strokeandfill implicitly draws the result with
328 SkPath::kWinding_FillType, so if the original path is even-odd, the 328 SkPath::kWinding_FillType, so if the original path is even-odd, the
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 631
632 SkImageFilter* getImageFilter() const { return fImageFilter; } 632 SkImageFilter* getImageFilter() const { return fImageFilter; }
633 SkImageFilter* setImageFilter(SkImageFilter*); 633 SkImageFilter* setImageFilter(SkImageFilter*);
634 634
635 SkAnnotation* getAnnotation() const { return fAnnotation; } 635 SkAnnotation* getAnnotation() const { return fAnnotation; }
636 SkAnnotation* setAnnotation(SkAnnotation*); 636 SkAnnotation* setAnnotation(SkAnnotation*);
637 637
638 /** 638 /**
639 * Returns true if there is an annotation installed on this paint, and 639 * Returns true if there is an annotation installed on this paint, and
640 * the annotation specifics no-drawing. 640 * the annotation specifics no-drawing.
641 *
642 * Deprecated: all annotations are no-draw. Please just check getAnnotatio n().
643 */ 641 */
642 SK_ATTR_DEPRECATED("use getAnnotation and check for non-null")
644 bool isNoDrawAnnotation() const { return this->getAnnotation() != NULL; } 643 bool isNoDrawAnnotation() const { return this->getAnnotation() != NULL; }
645 644
646 /** 645 /**
647 * Return the paint's SkDrawLooper (if any). Does not affect the looper's 646 * Return the paint's SkDrawLooper (if any). Does not affect the looper's
648 * reference count. 647 * reference count.
649 */ 648 */
650 SkDrawLooper* getLooper() const { return fLooper; } 649 SkDrawLooper* getLooper() const { return fLooper; }
651 650
652 /** 651 /**
653 * Set or clear the looper object. 652 * Set or clear the looper object.
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 #ifdef SK_BUILD_FOR_ANDROID 1075 #ifdef SK_BUILD_FOR_ANDROID
1077 SkPaintOptionsAndroid fPaintOptionsAndroid; 1076 SkPaintOptionsAndroid fPaintOptionsAndroid;
1078 1077
1079 // In order for the == operator to work properly this must be the last field 1078 // In order for the == operator to work properly this must be the last field
1080 // in the struct so that we can do a memcmp to this field's offset. 1079 // in the struct so that we can do a memcmp to this field's offset.
1081 uint32_t fGenerationID; 1080 uint32_t fGenerationID;
1082 #endif 1081 #endif
1083 }; 1082 };
1084 1083
1085 #endif 1084 #endif
OLDNEW
« no previous file with comments | « include/core/SkDevice.h ('k') | include/core/SkPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698