From f81d77c102ea2927852d9f938e0f18f0e16d33bb Mon Sep 17 00:00:00 2001 From: Emily Janzer Date: Thu, 18 Apr 2019 10:04:12 -0700 Subject: [PATCH] Change ViewManager.measure() to use Context instead of ReactContext Summary: It seems like ReactContext isn't actually needed in measure functions. Changing the signature of ViewManager.measure() to take a Context instead. Reviewed By: lunaleaps Differential Revision: D14940330 fbshipit-source-id: b29987fd1d7f9c191a5f26138151082ca61cb351 --- .../com/facebook/react/fabric/mounting/MountingManager.java | 2 +- .../main/java/com/facebook/react/uimanager/ViewManager.java | 3 ++- .../com/facebook/react/views/slider/ReactSliderManager.java | 3 ++- .../com/facebook/react/views/text/ReactTextViewManager.java | 3 ++- .../java/com/facebook/react/views/text/TextLayoutManager.java | 3 +-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java index 4daf4021802..050f6dd3083 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java @@ -334,7 +334,7 @@ public class MountingManager { @AnyThread public long measure( - ReactContext context, + Context context, String componentName, ReadableMap localData, ReadableMap props, diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java index 4a8c8ad0177..eecb4a4deb7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java @@ -7,6 +7,7 @@ package com.facebook.react.uimanager; +import android.content.Context; import android.view.View; import com.facebook.react.bridge.BaseJavaModule; import com.facebook.react.bridge.ReactApplicationContext; @@ -234,7 +235,7 @@ public abstract class ViewManager } public long measure( - ReactContext context, + Context context, ReadableMap localData, ReadableMap props, float width, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java index c287a04f0c8..69ba44072f1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java @@ -7,6 +7,7 @@ package com.facebook.react.views.slider; +import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; @@ -196,7 +197,7 @@ public class ReactSliderManager extends SimpleViewManager { @Override public long measure( - ReactContext context, + Context context, ReadableMap localData, ReadableMap props, float width, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java index 7e20919bfc7..55176ba026b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java @@ -6,6 +6,7 @@ */ package com.facebook.react.views.text; +import android.content.Context; import android.text.Layout; import android.text.Spannable; import com.facebook.react.bridge.ReactContext; @@ -112,7 +113,7 @@ public class ReactTextViewManager @Override public long measure( - ReactContext context, + Context context, ReadableMap localData, ReadableMap props, float width, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java index 3f02d2f32b4..e5344931068 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java @@ -19,7 +19,6 @@ import android.text.Spanned; import android.text.StaticLayout; import android.text.TextPaint; import android.util.LruCache; -import com.facebook.react.bridge.ReactContext; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.uimanager.PixelUtil; @@ -176,7 +175,7 @@ public class TextLayoutManager { } public static long measureText( - ReactContext context, + Context context, ReadableMap attributedString, ReadableMap paragraphAttributes, float width,