AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix conditionals for flag

Browse Source 
Bug: skia:
Change-Id: I892dedae72833d5fc203e5b09a74754757691aa0
Reviewed-on: https://skia-review.googlesource.com/c/181160
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2019-01-03 23:16:26 -05:00 committed by Skia Commit-Bot
parent 76616a10a7
commit fb93e61813
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/SkPaint.h
View File

@ -753,9 +753,7 @@ public:
*/ */
void setMaskFilter(sk_sp<SkMaskFilter> maskFilter); void setMaskFilter(sk_sp<SkMaskFilter> maskFilter);
#ifdef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS #ifndef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
public:
#else
private: private:
#endif #endif
/** Returns SkTypeface if set, or nullptr. /** Returns SkTypeface if set, or nullptr.
@ -778,7 +776,7 @@ private:
@param typeface font and style used to draw text @param typeface font and style used to draw text
*/ */
void setTypeface(sk_sp<SkTypeface> typeface); void setTypeface(sk_sp<SkTypeface> typeface);
#ifdef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS #ifndef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
public: public:
#endif #endif
@ -840,9 +838,7 @@ public:
*/ */
void setLooper(sk_sp<SkDrawLooper> drawLooper); void setLooper(sk_sp<SkDrawLooper> drawLooper);
#ifdef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS #ifndef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
public:
#else
private: private:
#endif #endif
/** Returns text size in points. /** Returns text size in points.
@ -901,7 +897,7 @@ private:
* @param encoding the new text encoding * @param encoding the new text encoding
*/ */
void setTextEncoding(SkTextEncoding encoding); void setTextEncoding(SkTextEncoding encoding);
#ifdef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS #ifndef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
public: public:
#endif #endif