From 908040534dfc9f227c60dbf170c6b27a1ff123d8 Mon Sep 17 00:00:00 2001 From: Raph Levien Date: Mon, 25 Aug 2014 09:36:29 -0700 Subject: [PATCH] Preserve paint parameters in Paint copy constructor The copy constructor for Paint was setting default values for additional parameters, rather than copying them from the original object, resulting in incorrect locale in the software text drawing path. Fix for bug 17149910 "Chinese font is used on IME even if the system language is Japanese" Change-Id: I25f377ce4e0ea66946a27ea46a2db524872ae36f --- core/jni/android/graphics/PaintImpl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/jni/android/graphics/PaintImpl.cpp b/core/jni/android/graphics/PaintImpl.cpp index e1b539e13a625..fac669ba8d086 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() {