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

Commit 3ad4f8ae authored by Mike Reed's avatar Mike Reed
Browse files

remove unused layout method in TestUtils 

Test: make

Change-Id: I30f4406750d7dfc8fb0f6a8aa07229a7478219e2
parent ab73b70e

libs/hwui/tests/common/TestUtils.cpp

+1 −38
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "DeferredLayerUpdater.h"

#include "DeferredLayerUpdater.h"

#include "hwui/Paint.h"

#include "hwui/Paint.h"





#include <SkClipStack.h>

#include <minikin/Layout.h>

#include <minikin/Layout.h>

#include <pipeline/skia/SkiaOpenGLPipeline.h>

#include <pipeline/skia/SkiaOpenGLPipeline.h>

#include <pipeline/skia/SkiaVulkanPipeline.h>

#include <pipeline/skia/SkiaVulkanPipeline.h>
@@ -27,7 +26,7 @@ 
#include <renderthread/VulkanManager.h>

#include <renderthread/VulkanManager.h>

#include <utils/Unicode.h>

#include <utils/Unicode.h>





#include <SkGlyphCache.h>

#include "SkColorData.h"





namespace android {

namespace android {

namespace uirenderer {

namespace uirenderer {
@@ -80,42 +79,6 @@ sp<DeferredLayerUpdater> TestUtils::createTextureLayerUpdater( 
    return layerUpdater;

    return layerUpdater;

}

}





void TestUtils::layoutTextUnscaled(const SkPaint& paint, const char* text,

                                   std::vector<glyph_t>* outGlyphs,

                                   std::vector<float>* outPositions, float* outTotalAdvance,

                                   Rect* outBounds) {

    Rect bounds;

    float totalAdvance = 0;

    SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);

    SkAutoGlyphCacheNoGamma autoCache(paint, &surfaceProps, &SkMatrix::I());

    while (*text != '\0') {

        size_t nextIndex = 0;

        int32_t unichar = utf32_from_utf8_at(text, 4, 0, &nextIndex);

        text += nextIndex;



        glyph_t glyph = autoCache->unicharToGlyph(unichar);

        autoCache->unicharToGlyph(unichar);



        // push glyph and its relative position

        outGlyphs->push_back(glyph);

        outPositions->push_back(totalAdvance);

        outPositions->push_back(0);



        // compute bounds

        SkGlyph skGlyph = autoCache->getUnicharMetrics(unichar);

        Rect glyphBounds(skGlyph.fWidth, skGlyph.fHeight);

        glyphBounds.translate(totalAdvance + skGlyph.fLeft, skGlyph.fTop);

        bounds.unionWith(glyphBounds);



        // advance next character

        SkScalar skWidth;

        paint.getTextWidths(&glyph, sizeof(glyph), &skWidth, NULL);

        totalAdvance += skWidth;

    }

    *outBounds = bounds;

    *outTotalAdvance = totalAdvance;

}



void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint& paint, float x,

void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint& paint, float x,

                                 float y) {

                                 float y) {

    auto utf16 = asciiToUtf16(text);

    auto utf16 = asciiToUtf16(text);

libs/hwui/tests/common/TestUtils.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -299,11 +299,6 @@ public: 




    static SkColor interpolateColor(float fraction, SkColor start, SkColor end);

    static SkColor interpolateColor(float fraction, SkColor start, SkColor end);





    static void layoutTextUnscaled(const SkPaint& paint, const char* text,

                                   std::vector<glyph_t>* outGlyphs,

                                   std::vector<float>* outPositions, float* outTotalAdvance,

                                   Rect* outBounds);



    static void drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint& paint, float x,

    static void drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint& paint, float x,

                                 float y);

                                 float y);