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

Commit 13ba0054 authored by Romain Guy's avatar Romain Guy
Browse files

Remove obsolete header file 

We now use the same mechanism to compare keys everywhere in libhwui.

Change-Id: I8b3cb25b13f4f38eb6f12aed0356f796a773617c
parent 00e59227

core/jni/android/graphics/TextLayoutCache.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <utils/String16.h>

#include <utils/LruCache.h>

#include <utils/KeyedVector.h>

#include <utils/Compare.h>

#include <utils/RefBase.h>

#include <utils/Singleton.h>

libs/hwui/Matrix.cpp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include <SkMatrix.h>



#include "utils/Compare.h"

#include "Matrix.h"



namespace android {

libs/hwui/Patch.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include "Rect.h"

#include "Vertex.h"

#include "utils/Compare.h"



namespace android {

namespace uirenderer {

libs/hwui/PatchCache.cpp

+30 −1
Original line number Diff line number Diff line
@@ -42,6 +42,35 @@ PatchCache::~PatchCache() { 
// Caching

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



int PatchCache::PatchDescription::compare(

        const PatchCache::PatchDescription& lhs, const PatchCache::PatchDescription& rhs) {

    int deltaInt = lhs.bitmapWidth - rhs.bitmapWidth;

    if (deltaInt != 0) return deltaInt;



    deltaInt = lhs.bitmapHeight - rhs.bitmapHeight;

    if (deltaInt != 0) return deltaInt;



    if (lhs.pixelWidth < rhs.pixelWidth) return -1;

    if (lhs.pixelWidth > lhs.pixelWidth) return +1;



    if (lhs.pixelHeight < rhs.pixelHeight) return -1;

    if (lhs.pixelHeight > lhs.pixelHeight) return +1;



    deltaInt = lhs.xCount - rhs.xCount;

    if (deltaInt != 0) return deltaInt;



    deltaInt = lhs.yCount - rhs.yCount;

    if (deltaInt != 0) return deltaInt;



    deltaInt = lhs.emptyCount - rhs.emptyCount;

    if (deltaInt != 0) return deltaInt;



    deltaInt = lhs.colorKey - rhs.colorKey;

    if (deltaInt != 0) return deltaInt;



    return 0;

}



void PatchCache::clear() {

    size_t count = mCache.size();

    for (size_t i = 0; i < count; i++) {
@@ -50,7 +79,7 @@ void PatchCache::clear() { 
    mCache.clear();

}



Patch* PatchCache::get(const float bitmapWidth, const float bitmapHeight,

Patch* PatchCache::get(const uint32_t bitmapWidth, const uint32_t bitmapHeight,

        const float pixelWidth, const float pixelHeight,

        const int32_t* xDivs, const int32_t* yDivs, const uint32_t* colors,

        const uint32_t width, const uint32_t height, const int8_t numColors) {

libs/hwui/PatchCache.h

+22 −22
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <utils/KeyedVector.h>



#include "utils/Compare.h"

#include "Debug.h"

#include "Patch.h"
@@ -47,7 +46,7 @@ public: 
    PatchCache(uint32_t maxCapacity);

    ~PatchCache();



    Patch* get(const float bitmapWidth, const float bitmapHeight,

    Patch* get(const uint32_t bitmapWidth, const uint32_t bitmapHeight,

            const float pixelWidth, const float pixelHeight,

            const int32_t* xDivs, const int32_t* yDivs, const uint32_t* colors,

            const uint32_t width, const uint32_t height, const int8_t numColors);
@@ -70,7 +69,7 @@ private: 
                xCount(0), yCount(0), emptyCount(0), colorKey(0) {

        }



        PatchDescription(const float bitmapWidth, const float bitmapHeight,

        PatchDescription(const uint32_t bitmapWidth, const uint32_t bitmapHeight,

                const float pixelWidth, const float pixelHeight,

                const uint32_t xCount, const uint32_t yCount,

                const int8_t emptyCount, const uint32_t colorKey):
@@ -80,28 +79,29 @@ private: 
                emptyCount(emptyCount), colorKey(colorKey) {

        }



        bool operator<(const PatchDescription& rhs) const {

            LTE_FLOAT(bitmapWidth) {

                LTE_FLOAT(bitmapHeight) {

                    LTE_FLOAT(pixelWidth) {

                        LTE_FLOAT(pixelHeight) {

                            LTE_INT(xCount) {

                                LTE_INT(yCount) {

                                    LTE_INT(emptyCount) {

                                        LTE_INT(colorKey) return false;

                                    }

                                }

                            }

                        }

        static int compare(const PatchDescription& lhs, const PatchDescription& rhs);



        bool operator==(const PatchDescription& other) const {

            return compare(*this, other) == 0;

        }



        bool operator!=(const PatchDescription& other) const {

            return compare(*this, other) != 0;

        }



        friend inline int strictly_order_type(const PatchDescription& lhs,

                const PatchDescription& rhs) {

            return PatchDescription::compare(lhs, rhs) < 0;

        }

            return false;



        friend inline int compare_type(const PatchDescription& lhs,

                const PatchDescription& rhs) {

            return PatchDescription::compare(lhs, rhs);

        }



    private:

        float bitmapWidth;

        float bitmapHeight;

        uint32_t bitmapWidth;

        uint32_t bitmapHeight;

        float pixelWidth;

        float pixelHeight;

        uint32_t xCount;