summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Raph Levien <raph@google.com> 2014-08-25 19:16:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-08-25 19:16:42 +0000
commit9897c73f12fb8bed7a46069e7142aaaa28d71f83 (patch)
tree4d3e3cbdca30b65d1478a634a72602fa2e865498
parentc8d3a86ea440c3ee7ca171c225f51c594ecaa226 (diff)
parent908040534dfc9f227c60dbf170c6b27a1ff123d8 (diff)
Merge "Preserve paint parameters in Paint copy constructor" into lmp-dev
-rw-r--r--core/jni/android/graphics/PaintImpl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/PaintImpl.cpp b/core/jni/android/graphics/PaintImpl.cpp
index e1b539e13a62..fac669ba8d08 100644
--- 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() {