Revert "Cache the layout result if the font feature is specified"
Revert submission 25211873-font_feature_cache
Reason for revert: accessing feature flag in native causes the peformance regression.
Reverted changes: /q/submissionid:25211873-font_feature_cache
Change-Id: I1f4b619c827d2968fd8b75aa05f65a2ed89b62a2
diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index d84b73d..8c71d6f 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -33,7 +33,6 @@
#include <cassert>
#include <cstring>
#include <memory>
-#include <string_view>
#include <vector>
#include "ColorFilter.h"
@@ -691,11 +690,10 @@
jstring settings) {
Paint* paint = reinterpret_cast<Paint*>(paintHandle);
if (!settings) {
- paint->resetFontFeatures();
+ paint->setFontFeatureSettings(std::string());
} else {
ScopedUtfChars settingsChars(env, settings);
- paint->setFontFeatureSettings(
- std::string_view(settingsChars.c_str(), settingsChars.size()));
+ paint->setFontFeatureSettings(std::string(settingsChars.c_str(), settingsChars.size()));
}
}