commit 9bda91a8160ab5e51e2a32cbca934e7ea37cf7c3
author Seigo Nonaka <nona@google.com> Sat Oct 28 19:11:22 2023 +0900
committer Seigo Nonaka <nona@google.com> Mon Nov 13 13:51:34 2023 +0900
tree b0bafc37aa0a057239e7a65a4e5fe1fc008ef248
parent fee79584f00dd188160a4eb87a2010d4e5e10d83

[2nd attempt] Cache the layout result if the font feature is specified

Bug: 283193133
Test: minikin_tests
Change-Id: I214aaa5c94742a4ce84222fb540851d488157ef6

libs/hwui/jni/Paint.cpp

diff --git a/libs/hwui/jni/Paint.cpp b/libs/hwui/jni/Paint.cpp
index 8c71d6f..d84b73d 100644
--- a/libs/hwui/jni/Paint.cpp
+++ b/libs/hwui/jni/Paint.cpp
@@ -33,6 +33,7 @@
 #include <cassert>
 #include <cstring>
 #include <memory>
+#include <string_view>
 #include <vector>
 
 #include "ColorFilter.h"
@@ -690,10 +691,11 @@
                                        jstring settings) {
         Paint* paint = reinterpret_cast<Paint*>(paintHandle);
         if (!settings) {
-            paint->setFontFeatureSettings(std::string());
+            paint->resetFontFeatures();
         } else {
             ScopedUtfChars settingsChars(env, settings);
-            paint->setFontFeatureSettings(std::string(settingsChars.c_str(), settingsChars.size()));
+            paint->setFontFeatureSettings(
+                    std::string_view(settingsChars.c_str(), settingsChars.size()));
         }
     }