Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back out "cache JNI calls to FabricUIManager::getColor" (#46871)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/46871

changelog: [internal]

Original commit changeset: 748efce7f0b8

Original Phabricator Diff: D59859754

This is temporarily until we find an actual solution that can both cache the colors and also react to theme changes updating the colors value properly.

Reviewed By: javache

Differential Revision: D64002346

fbshipit-source-id: 9ba3bd0d653b9a0d8617f45d42c0c3d966fba01f
This commit is contained in:
Alonso Paulino
2024-10-08 04:39:27 -07:00
committed by Facebook GitHub Bot
parent 40a4feb681
commit aaf7a6a3ab
1 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h
+20 -48
View File
@@ -8,27 +8,15 @@
#pragma once
#include <fbjni/fbjni.h>
#include <folly/container/EvictingCacheMap.h>
#include <react/debug/react_native_expect.h>
#include <react/renderer/core/RawValue.h>
#include <react/renderer/graphics/Color.h>
#include <react/renderer/graphics/fromRawValueShared.h>
#include <react/utils/ContextContainer.h>
#include <react/utils/hash_combine.h>
#include <unordered_map>
#include <vector>
namespace facebook::react {
static size_t hashGetColourArguments(
int32_t surfaceId,
const std::vector<std::string>& resourcePaths) {
std::size_t seed = surfaceId;
for (const auto& item : resourcePaths) {
facebook::react::hash_combine(seed, item);
}
return seed;
}
inline SharedColor parsePlatformColor(
const ContextContainer& contextContainer,
int32_t surfaceId,
@@ -37,45 +25,29 @@ inline SharedColor parsePlatformColor(
if (value.hasType<
std::unordered_map<std::string, std::vector<std::string>>>()) {
const auto& fabricUIManager =
contextContainer.at<jni::global_ref<jobject>>("FabricUIManager");
static auto getColorFromJava =
fabricUIManager->getClass()
->getMethod<jint(jint, jni::JArrayClass<jni::JString>)>("getColor");
auto map = (std::unordered_map<std::string, std::vector<std::string>>)value;
auto& resourcePaths = map["resource_paths"];
// JNI calls are time consuming. Let's cache results here to avoid
// unnecessary calls.
static auto getColorCache =
folly::EvictingCacheMap<size_t, ColorComponents>(64);
auto hash = hashGetColourArguments(surfaceId, resourcePaths);
auto iterator = getColorCache.find(hash);
if (iterator != getColorCache.end()) {
colorComponents = iterator->second;
} else {
const auto& fabricUIManager =
contextContainer.at<jni::global_ref<jobject>>("FabricUIManager");
static auto getColorFromJava =
fabricUIManager->getClass()
->getMethod<jint(jint, jni::JArrayClass<jni::JString>)>(
"getColor");
auto javaResourcePaths =
jni::JArrayClass<jni::JString>::newArray(resourcePaths.size());
for (int i = 0; i < resourcePaths.size(); i++) {
javaResourcePaths->setElement(i, *jni::make_jstring(resourcePaths[i]));
}
auto color =
getColorFromJava(fabricUIManager, surfaceId, *javaResourcePaths);
auto argb = (int64_t)color;
auto ratio = 255.f;
colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;
colorComponents.red = ((argb >> 16) & 0xFF) / ratio;
colorComponents.green = ((argb >> 8) & 0xFF) / ratio;
colorComponents.blue = (argb & 0xFF) / ratio;
getColorCache.set(hash, colorComponents);
auto javaResourcePaths =
jni::JArrayClass<jni::JString>::newArray(resourcePaths.size());
for (int i = 0; i < resourcePaths.size(); i++) {
javaResourcePaths->setElement(i, *jni::make_jstring(resourcePaths[i]));
}
auto color =
getColorFromJava(fabricUIManager, surfaceId, *javaResourcePaths);
auto argb = (int64_t)color;
auto ratio = 255.f;
colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;
colorComponents.red = ((argb >> 16) & 0xFF) / ratio;
colorComponents.green = ((argb >> 8) & 0xFF) / ratio;
colorComponents.blue = (argb & 0xFF) / ratio;
}
return {colorFromComponents(colorComponents)};