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

Commit 7741b690 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert "hwui: remove FatVector"" into rvc-dev am: e3c130ac 

Change-Id: I6e3fc8875b6bcb8643678145c031b1d629a3ff30
parents 676a8295 e3c130ac

libs/hwui/RenderNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "DamageAccumulator.h"

#include "pipeline/skia/SkiaDisplayList.h"

#endif

#include "utils/FatVector.h"

#include "utils/MathUtils.h"

#include "utils/StringUtils.h"

#include "utils/TraceUtils.h"
@@ -36,7 +37,6 @@ 
#include <atomic>

#include <sstream>

#include <string>

#include <ui/FatVector.h>



namespace android {

namespace uirenderer {

libs/hwui/RenderNode.h

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 


#include <androidfw/ResourceTypes.h>



#include <ui/FatVector.h>



#include "AnimatorManager.h"

#include "CanvasTransform.h"

#include "Debug.h"
@@ -37,6 +35,7 @@ 
#include "RenderProperties.h"

#include "pipeline/skia/SkiaDisplayList.h"

#include "pipeline/skia/SkiaLayer.h"

#include "utils/FatVector.h"



#include <vector>

libs/hwui/jni/FontFamily.cpp

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 


#include <hwui/MinikinSkia.h>

#include <hwui/Typeface.h>

#include <utils/FatVector.h>

#include <minikin/FontFamily.h>

#include <minikin/LocaleList.h>

#include <ui/FatVector.h>



#include <memory>
@@ -104,7 +104,7 @@ static jlong FontFamily_getFamilyReleaseFunc(CRITICAL_JNI_PARAMS) { 


static bool addSkTypeface(NativeFamilyBuilder* builder, sk_sp<SkData>&& data, int ttcIndex,

        jint weight, jint italic) {

    FatVector<SkFontArguments::Axis, 2> skiaAxes;

    uirenderer::FatVector<SkFontArguments::Axis, 2> skiaAxes;

    for (const auto& axis : builder->axes) {

        skiaAxes.emplace_back(SkFontArguments::Axis{axis.axisTag, axis.value});

    }

libs/hwui/jni/fonts/Font.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 


#include <hwui/MinikinSkia.h>

#include <hwui/Typeface.h>

#include <utils/FatVector.h>

#include <minikin/FontFamily.h>

#include <ui/FatVector.h>



#include <memory>
@@ -93,7 +93,7 @@ static jlong Font_Builder_build(JNIEnv* env, jobject clazz, jlong builderPtr, jo 
    sk_sp<SkData> data(SkData::MakeWithProc(fontPtr, fontSize,

            release_global_ref, reinterpret_cast<void*>(fontRef)));



    FatVector<SkFontArguments::Axis, 2> skiaAxes;

    uirenderer::FatVector<SkFontArguments::Axis, 2> skiaAxes;

    for (const auto& axis : builder->axes) {

        skiaAxes.emplace_back(SkFontArguments::Axis{axis.axisTag, axis.value});

    }

libs/hwui/pipeline/skia/ReorderBarrierDrawables.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <SkCanvas.h>

#include <SkDrawable.h>

#include <ui/FatVector.h>

#include <utils/FatVector.h>



namespace android {

namespace uirenderer {