patch from issue 383923002
TBR=
Author: reed@google.com
Review URL: https://codereview.chromium.org/394603003
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index e8d85ce..3874d98 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -89,7 +89,7 @@
};
Hinting getHinting() const {
- return static_cast<Hinting>(fHinting);
+ return static_cast<Hinting>(fBitfields.fHinting);
}
void setHinting(Hinting hintingLevel);
@@ -121,7 +121,7 @@
/** Return the paint's flags. Use the Flag enum to test flag values.
@return the paint's flags (see enums ending in _Flag for bit masks)
*/
- uint32_t getFlags() const { return fFlags; }
+ uint32_t getFlags() const { return fBitfields.fFlags; }
/** Set the paint's flags. Use the Flag enum to specific flag values.
@param flags The new flag bits for the paint (see Flags enum)
@@ -302,7 +302,9 @@
* Return the filter level. This affects the quality (and performance) of
* drawing scaled images.
*/
- FilterLevel getFilterLevel() const { return (FilterLevel)fFilterLevel; }
+ FilterLevel getFilterLevel() const {
+ return (FilterLevel)fBitfields.fFilterLevel;
+ }
/**
* Set the filter level. This affects the quality (and performance) of
@@ -350,7 +352,7 @@
kFill_Style).
@return the paint's Style
*/
- Style getStyle() const { return (Style)fStyle; }
+ Style getStyle() const { return (Style)fBitfields.fStyle; }
/** Set the paint's style, used for controlling how primitives'
geometries are interpreted (except for drawBitmap, which always assumes
@@ -456,7 +458,7 @@
@return the line cap style for the paint, used whenever the paint's
style is Stroke or StrokeAndFill.
*/
- Cap getStrokeCap() const { return (Cap)fCapType; }
+ Cap getStrokeCap() const { return (Cap)fBitfields.fCapType; }
/** Set the paint's stroke cap type.
@param cap set the paint's line cap style, used whenever the paint's
@@ -468,7 +470,7 @@
@return the paint's line join style, used whenever the paint's style is
Stroke or StrokeAndFill.
*/
- Join getStrokeJoin() const { return (Join)fJoinType; }
+ Join getStrokeJoin() const { return (Join)fBitfields.fJoinType; }
/** Set the paint's stroke join type.
@param join set the paint's line join style, used whenever the paint's
@@ -685,7 +687,7 @@
/** Return the paint's Align value for drawing text.
@return the paint's Align value for drawing text.
*/
- Align getTextAlign() const { return (Align)fTextAlign; }
+ Align getTextAlign() const { return (Align)fBitfields.fTextAlign; }
/** Set the paint's text alignment.
@param align set the paint's Align value for drawing text.
@@ -738,7 +740,9 @@
kGlyphID_TextEncoding //!< the text parameters are glyph indices
};
- TextEncoding getTextEncoding() const { return (TextEncoding)fTextEncoding; }
+ TextEncoding getTextEncoding() const {
+ return (TextEncoding)fBitfields.fTextEncoding;
+ }
void setTextEncoding(TextEncoding encoding);
@@ -1066,14 +1070,11 @@
unsigned fHinting : 2;
unsigned fFilterLevel : 2;
//unsigned fFreeBits : 2;
- };
- uint32_t fBitfields;
+ } fBitfields;
+ uint32_t fBitfieldsUInt;
};
uint32_t fDirtyBits;
- uint32_t getBitfields() const { return fBitfields; }
- void setBitfields(uint32_t bitfields);
-
SkDrawCacheProc getDrawCacheProc() const;
SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir,
bool needFullMetrics) const;