From bea77a07834f30c3652e2a708856796082245c4b Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 9 Jul 2015 17:45:39 -0700 Subject: [PATCH] Deep-copying sucks when all you want is a borrow Bug: 22378829 std::string only knows how to move & deep-copy, and we really don't want either here since the Paint object for certain outlives the stack scope so use a const reference instead. Change-Id: I1c822c6ba9647953899cfe89dcc670d7265e3973 --- core/jni/android/graphics/MinikinUtils.cpp | 2 +- core/jni/android/graphics/Paint.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/jni/android/graphics/MinikinUtils.cpp b/core/jni/android/graphics/MinikinUtils.cpp index 8bdbff43d379a..d1780d6526f53 100644 --- a/core/jni/android/graphics/MinikinUtils.cpp +++ b/core/jni/android/graphics/MinikinUtils.cpp @@ -33,7 +33,7 @@ FontStyle MinikinUtils::prepareMinikinPaint(MinikinPaint* minikinPaint, FontColl FontStyle resolved = resolvedFace->fStyle; /* Prepare minikin FontStyle */ - std::string lang = paint->getTextLocale(); + const std::string& lang = paint->getTextLocale(); FontLanguage minikinLang(lang.c_str(), lang.size()); FontVariant minikinVariant = (paint->getFontVariant() == VARIANT_ELEGANT) ? VARIANT_ELEGANT : VARIANT_COMPACT; diff --git a/core/jni/android/graphics/Paint.h b/core/jni/android/graphics/Paint.h index 1f82836d72bb6..6df22ff0964e3 100644 --- a/core/jni/android/graphics/Paint.h +++ b/core/jni/android/graphics/Paint.h @@ -57,7 +57,7 @@ public: mTextLocale = textLocale; } - std::string getTextLocale() const { + const std::string& getTextLocale() const { return mTextLocale; }