Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 31b81b3c: am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev

Browse Source 
* commit '31b81b3cb94befad39d1632d449b0a4d6eedf604':
  Deep-copying sucks when all you want is a borrow
This commit is contained in:
John Reck
2015-07-10 01:54:12 +00:00
committed by Android Git Automerger
parent 19cb068505 31b81b3cb9
commit ef6be305ff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android/graphics/MinikinUtils.cpp
View File

@@ -33,7 +33,7 @@ FontStyle MinikinUtils::prepareMinikinPaint(MinikinPaint* minikinPaint, FontColl
FontStyle resolved = resolvedFace->fStyle; FontStyle resolved = resolvedFace->fStyle;
/* Prepare minikin FontStyle */ /* Prepare minikin FontStyle */
std::string lang = paint->getTextLocale(); const std::string& lang = paint->getTextLocale();
FontLanguage minikinLang(lang.c_str(), lang.size()); FontLanguage minikinLang(lang.c_str(), lang.size());
FontVariant minikinVariant = (paint->getFontVariant() == VARIANT_ELEGANT) ? VARIANT_ELEGANT FontVariant minikinVariant = (paint->getFontVariant() == VARIANT_ELEGANT) ? VARIANT_ELEGANT
: VARIANT_COMPACT; : VARIANT_COMPACT;

2
core/jni/android/graphics/Paint.h
View File

@@ -57,7 +57,7 @@ public:
mTextLocale = textLocale; mTextLocale = textLocale;
} }
std::string getTextLocale() const { const std::string& getTextLocale() const {
return mTextLocale; return mTextLocale;
} }