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

Commit ed935c32 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 76ce8e52 to stage-aosp-master 

Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
parents 5aa4ba37 76ce8e52

libs/hwui/Animator.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ protected: 
        Finished,

    };



    BaseRenderNodeAnimator(float finalValue);

    explicit BaseRenderNodeAnimator(float finalValue);

    virtual ~BaseRenderNodeAnimator();



    virtual float getValue(RenderNode* target) const = 0;

libs/hwui/AssetAtlas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ namespace uirenderer { 
// Lifecycle

///////////////////////////////////////////////////////////////////////////////



void AssetAtlas::init(sp<GraphicBuffer> buffer, int64_t* map, int count) {

void AssetAtlas::init(const sp<GraphicBuffer>& buffer, int64_t* map, int count) {

    if (mImage) {

        return;

    }

libs/hwui/AssetAtlas.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public: 
     * initialized. To re-initialize the atlas, you must

     * first call terminate().

     */

    ANDROID_API void init(sp<GraphicBuffer> buffer, int64_t* map, int count);

    ANDROID_API void init(const sp<GraphicBuffer>& buffer, int64_t* map, int count);



    /**

     * Destroys the atlas texture. This object can be

libs/hwui/DisplayListOp.h

+9 −9
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public: 
class DrawOp : public DisplayListOp {

friend class MergingDrawBatch;

public:

    DrawOp(const SkPaint* paint)

    explicit DrawOp(const SkPaint* paint)

            : mPaint(paint), mQuickRejected(false) {}



    virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
@@ -244,7 +244,7 @@ public: 
    }



    // default empty constructor for bounds, to be overridden in child constructor body

    DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { }

    explicit DrawBoundedOp(const SkPaint* paint): DrawOp(paint) { }



    virtual bool getLocalBounds(Rect& localBounds) override {

        localBounds.set(mLocalBounds);
@@ -269,7 +269,7 @@ protected: 


class SaveOp : public StateOp {

public:

    SaveOp(int flags)

    explicit SaveOp(int flags)

            : mFlags(flags) {}



    virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
@@ -295,7 +295,7 @@ private: 


class RestoreToCountOp : public StateOp {

public:

    RestoreToCountOp(int count)

    explicit RestoreToCountOp(int count)

            : mCount(count) {}



    virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,
@@ -408,7 +408,7 @@ private: 


class RotateOp : public StateOp {

public:

    RotateOp(float degrees)

    explicit RotateOp(float degrees)

            : mDegrees(degrees) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
@@ -467,7 +467,7 @@ private: 


class SetMatrixOp : public StateOp {

public:

    SetMatrixOp(const SkMatrix& matrix)

    explicit SetMatrixOp(const SkMatrix& matrix)

            : mMatrix(matrix) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
@@ -492,7 +492,7 @@ private: 


class ConcatMatrixOp : public StateOp {

public:

    ConcatMatrixOp(const SkMatrix& matrix)

    explicit ConcatMatrixOp(const SkMatrix& matrix)

            : mMatrix(matrix) {}



    virtual void applyState(OpenGLRenderer& renderer, int saveCount) const override {
@@ -511,7 +511,7 @@ private: 


class ClipOp : public StateOp {

public:

    ClipOp(SkRegion::Op op) : mOp(op) {}

    explicit ClipOp(SkRegion::Op op) : mOp(op) {}



    virtual void defer(DeferStateStruct& deferStruct, int saveCount, int level,

            bool useQuickReject) override {
@@ -1384,7 +1384,7 @@ private: 


class DrawFunctorOp : public DrawOp {

public:

    DrawFunctorOp(Functor* functor)

    explicit DrawFunctorOp(Functor* functor)

            : DrawOp(nullptr), mFunctor(functor) {}



    virtual void applyDraw(OpenGLRenderer& renderer, Rect& dirty) override {

libs/hwui/Image.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
     * cannot be created, getTexture() will return 0 and getImage() will

     * return EGL_NO_IMAGE_KHR.

     */

    Image(sp<GraphicBuffer> buffer);

    explicit Image(sp<GraphicBuffer> buffer);

    ~Image();



    /**