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

Commit dcfef162 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix/suppress hwui google-explicit-constructor warnings"

parents 9fbe4817 f21b0b6d

libs/hwui/Matrix.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public: 


    explicit Matrix4(const float* v) { load(v); }



    Matrix4(const SkMatrix& v) {  // NOLINT, implicit

    Matrix4(const SkMatrix& v) {  // NOLINT(google-explicit-constructor)

        load(v);

    }

libs/hwui/Rect.h

+4 −4
Original line number Diff line number Diff line
@@ -57,15 +57,15 @@ public: 


    inline Rect(float width, float height) : left(0.0f), top(0.0f), right(width), bottom(height) {}



    inline Rect(const SkIRect& rect)

            :  // NOLINT, implicit

    inline Rect(const SkIRect& rect) // NOLINT(google-explicit-constructor)

            :

            left(rect.fLeft)

            , top(rect.fTop)

            , right(rect.fRight)

            , bottom(rect.fBottom) {}



    inline Rect(const SkRect& rect)

            :  // NOLINT, implicit

    inline Rect(const SkRect& rect) // NOLINT(google-explicit-constructor)

            :

            left(rect.fLeft)

            , top(rect.fTop)

            , right(rect.fRight)

libs/hwui/debug/GlesErrorCheckWrapper.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace debug { 


class GlesErrorCheckWrapper : public GlesDriver {

public:

    GlesErrorCheckWrapper(GlesDriver& base) : mBase(base) {}

    explicit GlesErrorCheckWrapper(GlesDriver& base) : mBase(base) {}



#define GL_ENTRY(ret, api, ...) virtual ret api##_(__VA_ARGS__) override;

#include "gles_decls.in"

libs/hwui/hwui/Paint.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public: 


    Paint();

    Paint(const Paint& paint);

    Paint(const SkPaint& paint);  // NOLINT(implicit)

    Paint(const SkPaint& paint);  // NOLINT(google-explicit-constructor)

    ~Paint();



    Paint& operator=(const Paint& other);

libs/hwui/service/GraphicsStatsService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static void dumpAsTextToFd(protos::GraphicsStatsProto* proto, int outFd); 


class FileDescriptor {

public:

    FileDescriptor(int fd) : mFd(fd) {}

    explicit FileDescriptor(int fd) : mFd(fd) {}

    ~FileDescriptor() {

        if (mFd != -1) {

            close(mFd);
@@ -56,7 +56,7 @@ public: 
        }

    }

    bool valid() { return mFd != -1; }

    operator int() { return mFd; }

    operator int() { return mFd; } // NOLINT(google-explicit-constructor)



private:

    int mFd;
@@ -64,7 +64,7 @@ private: 


class FileOutputStreamLite : public io::ZeroCopyOutputStream {

public:

    FileOutputStreamLite(int fd) : mCopyAdapter(fd), mImpl(&mCopyAdapter) {}

    explicit FileOutputStreamLite(int fd) : mCopyAdapter(fd), mImpl(&mCopyAdapter) {}

    virtual ~FileOutputStreamLite() {}



    int GetErrno() { return mCopyAdapter.mErrno; }
@@ -82,7 +82,7 @@ private: 
        int mFd;

        int mErrno = 0;



        FDAdapter(int fd) : mFd(fd) {}

        explicit FDAdapter(int fd) : mFd(fd) {}

        virtual ~FDAdapter() {}



        virtual bool Write(const void* buffer, int size) override {