JNI interface tweak to avoid an implicit circular dep

PiperOrigin-RevId: 854322831

Author: sfreilich

ink/brush/internal/jni/BUILD.bazel

@@ -27,6 +27,7 @@ cc_library(
         ":brush_jni",
         ":brush_paint_jni",
         ":brush_tip_jni",
+        ":color_extensions_jni",
         ":color_function_jni",
         ":easing_function_jni",
         ":stock_brushes_jni",

ink/brush/internal/jni/brush_jni_helper.cc

@@ -34,8 +34,8 @@ jlong ComputeColorLong(JNIEnv* env, const Color& color) {
                                 : color.InColorSpace(ColorSpace::kDisplayP3))
           .AsFloat(Color::Format::kGammaEncoded);
   return env->CallStaticLongMethod(
-      ClassBrushNative(env),
-      MethodBrushNativeComposeColorLongFromComponents(env),
+      ClassColorNative(env),
+      MethodColorNativeComposeColorLongFromComponents(env),
       ColorSpaceToJInt(color_space_is_supported ? original_color_space
                                                 : ColorSpace::kDisplayP3),
       rgba.r, rgba.g, rgba.b, rgba.a);

ink/jni/internal/jni_jvm_interface.cc

@@ -56,8 +56,8 @@ static jclass class_mutable_parallelogram = nullptr;
 static jmethodID method_mutable_parallelogram_set_center_dim_rot_shear =
     nullptr;
 
-static jclass class_brush_native = nullptr;
-static jmethodID method_brush_native_compose_color_long_from_components =
+static jclass class_color_native = nullptr;
+static jmethodID method_color_native_compose_color_long_from_components =
     nullptr;
 
 static jclass class_input_tool_type = nullptr;
@@ -134,8 +134,8 @@ void UnloadJvmInterface(JNIEnv* env) {
   DeleteCachedClass(env, class_mutable_parallelogram);
   method_mutable_parallelogram_set_center_dim_rot_shear = nullptr;
 
-  DeleteCachedClass(env, class_brush_native);
-  method_brush_native_compose_color_long_from_components = nullptr;
+  DeleteCachedClass(env, class_color_native);
+  method_color_native_compose_color_long_from_components = nullptr;
 
   DeleteCachedClass(env, class_input_tool_type);
   method_input_tool_type_from = nullptr;
@@ -342,21 +342,21 @@ jmethodID MethodMutableParallelogramSetCenterDimensionsRotationInDegreesAndSkew(
   return method_mutable_parallelogram_set_center_dim_rot_shear;
 }
 
-jclass ClassBrushNative(JNIEnv* env) {
-  if (class_brush_native == nullptr) {
-    class_brush_native =
-        FindAndCacheClass(env, INK_PACKAGE "/brush/BrushNative");
+jclass ClassColorNative(JNIEnv* env) {
+  if (class_color_native == nullptr) {
+    class_color_native =
+        FindAndCacheClass(env, INK_PACKAGE "/brush/ColorNative");
   }
-  return class_brush_native;
+  return class_color_native;
 }
 
-jmethodID MethodBrushNativeComposeColorLongFromComponents(JNIEnv* env) {
-  if (method_brush_native_compose_color_long_from_components == nullptr) {
-    method_brush_native_compose_color_long_from_components =
-        GetStaticMethodId(env, ClassBrushNative(env),
+jmethodID MethodColorNativeComposeColorLongFromComponents(JNIEnv* env) {
+  if (method_color_native_compose_color_long_from_components == nullptr) {
+    method_color_native_compose_color_long_from_components =
+        GetStaticMethodId(env, ClassColorNative(env),
                           "composeColorLongFromComponents", "(IFFFF)J");
   }
-  return method_brush_native_compose_color_long_from_components;
+  return method_color_native_compose_color_long_from_components;
 }
 
 jclass ClassInputToolType(JNIEnv* env) {

ink/jni/internal/jni_jvm_interface.h

@@ -69,8 +69,8 @@ jclass ClassMutableParallelogram(JNIEnv* env);
 jmethodID MethodMutableParallelogramSetCenterDimensionsRotationInDegreesAndSkew(
     JNIEnv* env);
 
-jclass ClassBrushNative(JNIEnv* env);
-jmethodID MethodBrushNativeComposeColorLongFromComponents(JNIEnv* env);
+jclass ClassColorNative(JNIEnv* env);
+jmethodID MethodColorNativeComposeColorLongFromComponents(JNIEnv* env);
 
 jclass ClassInputToolType(JNIEnv* env);
 jmethodID MethodInputToolTypeFromInt(JNIEnv* env);