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

Commit c1a8a46f authored by Ben Wagner's avatar Ben Wagner
Browse files

Remove use of SkRefCnt_SafeAssign. 

Update pointer to SkRefCnt fields which require it to sk_sp.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4f3eb790ee67c09746708458c4492569b64cc58f
parent ef594270

libs/hwui/RenderProperties.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -44,8 +44,8 @@ void LayerProperties::reset() { 
}

}





bool LayerProperties::setColorFilter(SkColorFilter* filter) {

bool LayerProperties::setColorFilter(SkColorFilter* filter) {

    if (mColorFilter == filter) return false;

    if (mColorFilter.get() == filter) return false;

    SkRefCnt_SafeAssign(mColorFilter, filter);

    mColorFilter = sk_ref_sp(filter);

    return true;

    return true;

}

}
@@ -62,7 +62,7 @@ LayerProperties& LayerProperties::operator=(const LayerProperties& other) { 
    setOpaque(other.opaque());

    setOpaque(other.opaque());

    setAlpha(other.alpha());

    setAlpha(other.alpha());

    setXferMode(other.xferMode());

    setXferMode(other.xferMode());

    setColorFilter(other.colorFilter());

    setColorFilter(other.getColorFilter());

    return *this;

    return *this;

}

}

libs/hwui/RenderProperties.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -89,9 +89,7 @@ public: 




    SkBlendMode xferMode() const { return mMode; }

    SkBlendMode xferMode() const { return mMode; }





    bool setColorFilter(SkColorFilter* filter);

    SkColorFilter* getColorFilter() const { return mColorFilter.get(); }



    SkColorFilter* colorFilter() const { return mColorFilter; }





    // Sets alpha, xfermode, and colorfilter from an SkPaint

    // Sets alpha, xfermode, and colorfilter from an SkPaint

    // paint may be NULL, in which case defaults will be set

    // paint may be NULL, in which case defaults will be set
@@ -105,6 +103,7 @@ private: 
    LayerProperties();

    LayerProperties();

    ~LayerProperties();

    ~LayerProperties();

    void reset();

    void reset();

    bool setColorFilter(SkColorFilter* filter);





    // Private since external users should go through properties().effectiveLayerType()

    // Private since external users should go through properties().effectiveLayerType()

    LayerType type() const { return mType; }

    LayerType type() const { return mType; }
@@ -116,7 +115,7 @@ private: 
    bool mOpaque;

    bool mOpaque;

    uint8_t mAlpha;

    uint8_t mAlpha;

    SkBlendMode mMode;

    SkBlendMode mMode;

    SkColorFilter* mColorFilter = nullptr;

    sk_sp<SkColorFilter> mColorFilter;

};

};





/*

/*

libs/hwui/VectorDrawable.h

+16 −24
Original line number Original line Diff line number Diff line
@@ -59,12 +59,6 @@ namespace VectorDrawable { 
        onPropertyChanged();                                          \

        onPropertyChanged();                                          \

        retVal;                                                       \

        retVal;                                                       \

    })

    })

#define UPDATE_SKPROP(field, value)                                    \

    ({                                                                 \

        bool retVal = ((field) != (value));                            \

        if ((field) != (value)) SkRefCnt_SafeAssign((field), (value)); \

        retVal;                                                        \

    })





/* A VectorDrawable is composed of a tree of nodes.

/* A VectorDrawable is composed of a tree of nodes.

 * Each node can be a group node, or a path.

 * Each node can be a group node, or a path.
@@ -223,29 +217,28 @@ public: 
            int fillType = 0; /* non-zero or kWinding_FillType in Skia */

            int fillType = 0; /* non-zero or kWinding_FillType in Skia */

        };

        };

        explicit FullPathProperties(Node* mNode) : Properties(mNode), mTrimDirty(false) {}

        explicit FullPathProperties(Node* mNode) : Properties(mNode), mTrimDirty(false) {}

        ~FullPathProperties() {

        ~FullPathProperties() {}

            SkSafeUnref(fillGradient);

            SkSafeUnref(strokeGradient);

        }

        void syncProperties(const FullPathProperties& prop) {

        void syncProperties(const FullPathProperties& prop) {

            mPrimitiveFields = prop.mPrimitiveFields;

            mPrimitiveFields = prop.mPrimitiveFields;

            mTrimDirty = true;

            mTrimDirty = true;

            UPDATE_SKPROP(fillGradient, prop.fillGradient);

            fillGradient = prop.fillGradient;

            UPDATE_SKPROP(strokeGradient, prop.strokeGradient);

            strokeGradient = prop.strokeGradient;

            onPropertyChanged();

            onPropertyChanged();

        }

        }

        void setFillGradient(SkShader* gradient) {

        void setFillGradient(SkShader* gradient) {

            if (UPDATE_SKPROP(fillGradient, gradient)) {

            if (fillGradient.get() != gradient) {

                fillGradient = sk_ref_sp(gradient);

                onPropertyChanged();

                onPropertyChanged();

            }

            }

        }

        }

        void setStrokeGradient(SkShader* gradient) {

        void setStrokeGradient(SkShader* gradient) {

            if (UPDATE_SKPROP(strokeGradient, gradient)) {

            if (strokeGradient.get() != gradient) {

                strokeGradient = sk_ref_sp(gradient);

                onPropertyChanged();

                onPropertyChanged();

            }

            }

        }

        }

        SkShader* getFillGradient() const { return fillGradient; }

        SkShader* getFillGradient() const { return fillGradient.get(); }

        SkShader* getStrokeGradient() const { return strokeGradient; }

        SkShader* getStrokeGradient() const { return strokeGradient.get(); }

        float getStrokeWidth() const { return mPrimitiveFields.strokeWidth; }

        float getStrokeWidth() const { return mPrimitiveFields.strokeWidth; }

        void setStrokeWidth(float strokeWidth) {

        void setStrokeWidth(float strokeWidth) {

            VD_SET_PRIMITIVE_FIELD_AND_NOTIFY(strokeWidth, strokeWidth);

            VD_SET_PRIMITIVE_FIELD_AND_NOTIFY(strokeWidth, strokeWidth);
@@ -325,8 +318,8 @@ public: 
            count,

            count,

        };

        };

        PrimitiveFields mPrimitiveFields;

        PrimitiveFields mPrimitiveFields;

        SkShader* fillGradient = nullptr;

        sk_sp<SkShader> fillGradient;

        SkShader* strokeGradient = nullptr;

        sk_sp<SkShader> strokeGradient;

    };

    };





    // Called from UI thread

    // Called from UI thread
@@ -550,8 +543,7 @@ public: 
            SkRect bounds;

            SkRect bounds;

            int scaledWidth = 0;

            int scaledWidth = 0;

            int scaledHeight = 0;

            int scaledHeight = 0;

            SkColorFilter* colorFilter = nullptr;

            sk_sp<SkColorFilter> colorFilter;

            ~NonAnimatableProperties() { SkSafeUnref(colorFilter); }

        } mNonAnimatableProperties;

        } mNonAnimatableProperties;

        bool mNonAnimatablePropertiesDirty = true;

        bool mNonAnimatablePropertiesDirty = true;
@@ -561,8 +553,7 @@ public: 
        void syncNonAnimatableProperties(const TreeProperties& prop) {

        void syncNonAnimatableProperties(const TreeProperties& prop) {

            // Copy over the data that can only be changed in UI thread

            // Copy over the data that can only be changed in UI thread

            if (mNonAnimatableProperties.colorFilter != prop.mNonAnimatableProperties.colorFilter) {

            if (mNonAnimatableProperties.colorFilter != prop.mNonAnimatableProperties.colorFilter) {

                SkRefCnt_SafeAssign(mNonAnimatableProperties.colorFilter,

                mNonAnimatableProperties.colorFilter = prop.mNonAnimatableProperties.colorFilter;

                                    prop.mNonAnimatableProperties.colorFilter);

            }

            }

            mNonAnimatableProperties = prop.mNonAnimatableProperties;

            mNonAnimatableProperties = prop.mNonAnimatableProperties;

        }

        }
@@ -599,12 +590,13 @@ public: 
            }

            }

        }

        }

        void setColorFilter(SkColorFilter* filter) {

        void setColorFilter(SkColorFilter* filter) {

            if (UPDATE_SKPROP(mNonAnimatableProperties.colorFilter, filter)) {

            if (mNonAnimatableProperties.colorFilter.get() != filter) {

                mNonAnimatableProperties.colorFilter = sk_ref_sp(filter);

                mNonAnimatablePropertiesDirty = true;

                mNonAnimatablePropertiesDirty = true;

                mTree->onPropertyChanged(this);

                mTree->onPropertyChanged(this);

            }

            }

        }

        }

        SkColorFilter* getColorFilter() const { return mNonAnimatableProperties.colorFilter; }

        SkColorFilter* getColorFilter() const { return mNonAnimatableProperties.colorFilter.get(); }





        float getViewportWidth() const { return mNonAnimatableProperties.viewportWidth; }

        float getViewportWidth() const { return mNonAnimatableProperties.viewportWidth; }

        float getViewportHeight() const { return mNonAnimatableProperties.viewportHeight; }

        float getViewportHeight() const { return mNonAnimatableProperties.viewportHeight; }

libs/hwui/pipeline/skia/RenderNodeDrawable.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -156,10 +156,10 @@ static bool layerNeedsPaint(const LayerProperties& properties, float alphaMultip 
                            SkPaint* paint) {

                            SkPaint* paint) {

    paint->setFilterQuality(kLow_SkFilterQuality);

    paint->setFilterQuality(kLow_SkFilterQuality);

    if (alphaMultiplier < 1.0f || properties.alpha() < 255 ||

    if (alphaMultiplier < 1.0f || properties.alpha() < 255 ||

        properties.xferMode() != SkBlendMode::kSrcOver || properties.colorFilter() != nullptr) {

        properties.xferMode() != SkBlendMode::kSrcOver || properties.getColorFilter() != nullptr) {

        paint->setAlpha(properties.alpha() * alphaMultiplier);

        paint->setAlpha(properties.alpha() * alphaMultiplier);

        paint->setBlendMode(properties.xferMode());

        paint->setBlendMode(properties.xferMode());

        paint->setColorFilter(sk_ref_sp(properties.colorFilter()));

        paint->setColorFilter(sk_ref_sp(properties.getColorFilter()));

        return true;

        return true;

    }

    }

    return false;

    return false;