am c926bcf7: am a8eb3b2e: am 66cb62c6: Merge "Preserve paint parameters in Paint copy constructor" into lmp-dev

* commit 'c926bcf740fc4448953bcdeaf4e7636c690872eb': Preserve paint parameters in Paint copy constructor
2014-08-26 10:08:00 +00:00
parent 1b12e161f3 8433bf7190
commit bfc122aa90
1 changed files with 2 additions and 1 deletions
--- a/core/jni/android/graphics/PaintImpl.cpp
+++ b/core/jni/android/graphics/PaintImpl.cpp
@@ -27,7 +27,8 @@ Paint::Paint() : SkPaint(),
 }

 Paint::Paint(const Paint& paint) : SkPaint(paint),
-        mLetterSpacing(0), mFontFeatureSettings(), mTextLocale(), mFontVariant(VARIANT_DEFAULT) {
+        mLetterSpacing(paint.mLetterSpacing), mFontFeatureSettings(paint.mFontFeatureSettings),
+        mTextLocale(paint.mTextLocale), mFontVariant(paint.mFontVariant) {
 }

 Paint::~Paint() {