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

Commit b624af3d authored by Jagadeesh Pakaravoor's avatar Jagadeesh Pakaravoor Committed by Tim Murray
Browse files

Revert^2 "hwui: remove FatVector" 

Revert submission 10449863-revert-fatvector

Reason for revert: b/149254345

Original change (of introducing FatVector) was reverted as a stop-gap solution to fix the aforementioned bug.

The bug was caused by an ABI lock between Surface's definition (that changed with Region) and lib-imsvt prebuilt.

Enabling this change now as we have re-compiled the prebuilt with the change enabled. Doing that via a revert of the revert.

Reverted Changes:
I8ac66acb8:Revert "hwui: remove FatVector"
Ib60dbf3ef:Revert "libui: rewrite Region with FatVector"

Original changes:
I09dc2fddd:hwui: remove FatVector
I265c6c831:libui: rewrite Region with FatVector

bug: 149254345

Change-Id: I9fb5e8908434abb9a763992e922445a2dc37e865
parent 894f132b

libs/hwui/RenderNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#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"
@@ -37,6 +36,7 @@ 
#include <atomic>

#include <sstream>

#include <string>

#include <ui/FatVector.h>



namespace android {

namespace uirenderer {

libs/hwui/RenderNode.h

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


#include <androidfw/ResourceTypes.h>



#include <ui/FatVector.h>



#include "AnimatorManager.h"

#include "CanvasTransform.h"

#include "Debug.h"
@@ -35,7 +37,6 @@ 
#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) {

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

    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)));



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

    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 <utils/FatVector.h>

#include <ui/FatVector.h>



namespace android {

namespace uirenderer {