Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10965f39 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Convert ColorLong in native code in Paint 

Bug: 127580253
Test: CtsGraphicsTestCases
Perf: systrace

Follow on to I0b42c17159b290868a6bed7b90da096995504c4d, which did this
for other classes. I expect this to be more efficient due to passing
fewer JNI parameters, which appears to be the case based on the systrace
data for setColor(@ColorLong):

Duration:
(w/o this change)       (w/ this change)
avg:	0.010 ms        0.005 ms
max:	9.130 ms        0.239 ms
min:	0.002 ms        0.002 ms
std:	0.052 ms        0.004 ms

The average is twice as fast, the max is significantly shorter, and the
standard deviation is much smaller as well.

Change-Id: I241824bf2a934746df93da1063b14f3080486cb5
parent 03b3e236

core/jni/android/graphics/Paint.cpp

+6 −6
Original line number Diff line number Diff line
@@ -724,9 +724,9 @@ namespace PaintGlue { 
    }



    static void setColorLong(jlong paintHandle, jlong colorSpaceHandle,

            jfloat r, jfloat g, jfloat b, jfloat a) {

            jlong colorLong) {

        SkColor4f color = GraphicsJNI::convertColorLong(colorLong);

        sk_sp<SkColorSpace> cs = GraphicsJNI::getNativeColorSpace(colorSpaceHandle);

        SkColor4f color = SkColor4f{r, g, b, a};

        reinterpret_cast<Paint*>(paintHandle)->setColor4f(color, cs.get());

    }
@@ -995,9 +995,9 @@ namespace PaintGlue { 


    static void setShadowLayer(jlong paintHandle, jfloat radius,

                               jfloat dx, jfloat dy, jlong colorSpaceHandle,

                               jfloat r, jfloat g, jfloat b, jfloat a) {

                               jlong colorLong) {

        SkColor4f color = GraphicsJNI::convertColorLong(colorLong);

        sk_sp<SkColorSpace> cs = GraphicsJNI::getNativeColorSpace(colorSpaceHandle);

        SkColor4f color = SkColor4f{r, g, b, a};



        Paint* paint = reinterpret_cast<Paint*>(paintHandle);

        if (radius <= 0) {
@@ -1087,7 +1087,7 @@ static const JNINativeMethod methods[] = { 
    {"nGetStyle","(J)I", (void*) PaintGlue::getStyle},

    {"nSetStyle","(JI)V", (void*) PaintGlue::setStyle},

    {"nSetColor","(JI)V", (void*) PaintGlue::setColor},

    {"nSetColor","(JJFFFF)V", (void*) PaintGlue::setColorLong},

    {"nSetColor","(JJJ)V", (void*) PaintGlue::setColorLong},

    {"nSetAlpha","(JI)V", (void*) PaintGlue::setAlpha},

    {"nGetStrokeWidth","(J)F", (void*) PaintGlue::getStrokeWidth},

    {"nSetStrokeWidth","(JF)V", (void*) PaintGlue::setStrokeWidth},
@@ -1130,7 +1130,7 @@ static const JNINativeMethod methods[] = { 
    {"nGetUnderlineThickness","(J)F", (void*) PaintGlue::getUnderlineThickness},

    {"nGetStrikeThruPosition","(J)F", (void*) PaintGlue::getStrikeThruPosition},

    {"nGetStrikeThruThickness","(J)F", (void*) PaintGlue::getStrikeThruThickness},

    {"nSetShadowLayer", "(JFFFJFFFF)V", (void*)PaintGlue::setShadowLayer},

    {"nSetShadowLayer", "(JFFFJJ)V", (void*)PaintGlue::setShadowLayer},

    {"nHasShadowLayer", "(J)Z", (void*)PaintGlue::hasShadowLayer},

    {"nEqualsForTextMeasurement", "(JJ)Z", (void*)PaintGlue::equalsForTextMeasurement},

};

graphics/java/android/graphics/Paint.java

+7 −12
Original line number Diff line number Diff line
@@ -1066,12 +1066,8 @@ public class Paint { 
     */

    public void setColor(@ColorLong long color) {

        ColorSpace cs = Color.colorSpace(color);

        float r = Color.red(color);

        float g = Color.green(color);

        float b = Color.blue(color);

        float a = Color.alpha(color);



        nSetColor(mNativePaint, cs.getNativeInstance(), r, g, b, a);

        nSetColor(mNativePaint, cs.getNativeInstance(), color);

        mColor = color;

    }
@@ -1501,11 +1497,7 @@ public class Paint { 
     */

    public void setShadowLayer(float radius, float dx, float dy, @ColorLong long shadowColor) {

        ColorSpace cs = Color.colorSpace(shadowColor);

        float r = Color.red(shadowColor);

        float g = Color.green(shadowColor);

        float b = Color.blue(shadowColor);

        float a = Color.alpha(shadowColor);

        nSetShadowLayer(mNativePaint, radius, dx, dy, cs.getNativeInstance(), r, g, b, a);

        nSetShadowLayer(mNativePaint, radius, dx, dy, cs.getNativeInstance(), shadowColor);



        mShadowLayerRadius = radius;

        mShadowLayerDx = dx;
@@ -1533,6 +1525,7 @@ public class Paint { 
    /**

     * Returns the blur radius of the shadow layer.

     * @see #setShadowLayer(float,float,float,int)

     * @see #setShadowLayer(float,float,float,long)

     */

    public float getShadowLayerRadius() {

        return mShadowLayerRadius;
@@ -1541,6 +1534,7 @@ public class Paint { 
    /**

     * Returns the x offset of the shadow layer.

     * @see #setShadowLayer(float,float,float,int)

     * @see #setShadowLayer(float,float,float,long)

     */

    public float getShadowLayerDx() {

        return mShadowLayerDx;
@@ -1549,6 +1543,7 @@ public class Paint { 
    /**

     * Returns the y offset of the shadow layer.

     * @see #setShadowLayer(float,float,float,int)

     * @see #setShadowLayer(float,float,float,long)

     */

    public float getShadowLayerDy() {

        return mShadowLayerDy;
@@ -3138,7 +3133,7 @@ public class Paint { 
    @CriticalNative

    private static native void nSetShadowLayer(long paintPtr,

            float radius, float dx, float dy, long colorSpaceHandle,

            float r, float g, float b, float a);

            @ColorLong long shadowColor);

    @CriticalNative

    private static native boolean nHasShadowLayer(long paintPtr);

    @CriticalNative
@@ -3191,7 +3186,7 @@ public class Paint { 
    private static native void nSetFilterBitmap(long paintPtr, boolean filter);

    @CriticalNative

    private static native void nSetColor(long paintPtr, long colorSpaceHandle,

            float r, float g, float b, float a);

            @ColorLong long color);

    @CriticalNative

    private static native void nSetColor(long paintPtr, @ColorInt int color);

    @CriticalNative