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

Unified Diff: include/core/SkPaint.h

Issue 206623005: Revert of SkPaint: eliminate some dead bytes in 64-bit build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/core/SkPaint.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPaint.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 7a647f0ea2aff89f998ac206656214099afeed32..e86d01195c8e892d417c08b7d59b014af613e39e 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -1046,6 +1046,10 @@
private:
SkTypeface* fTypeface;
+ SkScalar fTextSize;
+ SkScalar fTextScaleX;
+ SkScalar fTextSkewX;
+
SkPathEffect* fPathEffect;
SkShader* fShader;
SkXfermode* fXfermode;
@@ -1056,12 +1060,10 @@
SkImageFilter* fImageFilter;
SkAnnotation* fAnnotation;
- SkScalar fTextSize;
- SkScalar fTextScaleX;
- SkScalar fTextSkewX;
SkColor fColor;
SkScalar fWidth;
SkScalar fMiterLimit;
+
union {
struct {
// all of these bitfields should add up to 32
@@ -1076,10 +1078,10 @@
};
uint32_t fBitfields;
};
- uint32_t fDirtyBits;
-
uint32_t getBitfields() const { return fBitfields; }
void setBitfields(uint32_t bitfields);
+
+ uint32_t fDirtyBits;
SkDrawCacheProc getDrawCacheProc() const;
SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir,
« no previous file with comments | « no previous file | src/core/SkPaint.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698