diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-20 23:02:35 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-20 23:02:35 +0000 |
commit | f48182b1614be99117b65118eefd3cd66e2d1f9a (patch) | |
tree | 62528deed8cbda18a16815970364fa5356fe21d9 /include/core/SkPaint.h | |
parent | 9615d5fc040e7302ce870639ab221233f56fff7c (diff) |
SkPaint: eliminate some dead bytes in 64-bit build.
+ memcpy-based copy constructor was hiding this gap -> manual copy constructor.
+ Split tests for finer-grained failures.
BUG=skia:
Committed: http://code.google.com/p/skia/source/detail?r=13856
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/203203003
git-svn-id: http://skia.googlecode.com/svn/trunk@13887 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkPaint.h')
-rw-r--r-- | include/core/SkPaint.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index e86d01195c..7a647f0ea2 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -1046,10 +1046,6 @@ public: private: SkTypeface* fTypeface; - SkScalar fTextSize; - SkScalar fTextScaleX; - SkScalar fTextSkewX; - SkPathEffect* fPathEffect; SkShader* fShader; SkXfermode* fXfermode; @@ -1060,10 +1056,12 @@ private: 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 @@ -1078,11 +1076,11 @@ private: }; 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, bool needFullMetrics) const; |