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

Commit ab12c1fe authored by Mike Reed's avatar Mike Reed
Browse files

update callers to newer Skia APIs 

Test: refactoring CL. Existing unit tests still pass.

Change-Id: I47e73e00f14f78dd9d4c48a142ac9853e7e4cad7
parent a2788423

core/jni/android/graphics/Bitmap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { 
    std::unique_ptr<SkBitmap> bitmap(new SkBitmap);



    if (!bitmap->setInfo(SkImageInfo::Make(width, height, colorType, alphaType,

            isSRGB ? SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr), rowBytes)) {

            isSRGB ? SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named) : nullptr), rowBytes)) {

        return NULL;

    }
@@ -921,7 +921,7 @@ static jboolean Bitmap_writeToParcel(JNIEnv* env, jobject, 
    auto bitmapWrapper = reinterpret_cast<BitmapWrapper*>(bitmapHandle);

    bitmapWrapper->getSkBitmap(&bitmap);



    sk_sp<SkColorSpace> sRGB = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);

    sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);

    bool isSRGB = bitmap.colorSpace() == sRGB.get();



    p->writeInt32(isMutable);

core/jni/android/graphics/Graphics.cpp

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ android::Bitmap* GraphicsJNI::mapAshmemBitmap(JNIEnv* env, SkBitmap* bitmap, 


sk_sp<SkColorSpace> GraphicsJNI::defaultColorSpace() {

#ifdef ANDROID_ENABLE_LINEAR_BLENDING

    return SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);

    return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);

#else

    return nullptr;

#endif

libs/hwui/Texture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ void Texture::upload(Bitmap& bitmap) { 
        setDefaultParams = true;

    }



    sk_sp<SkColorSpace> sRGB = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);

    sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);

    bool needSRGB = bitmap.info().colorSpace() == sRGB.get();



    GLint internalFormat, format, type;

libs/hwui/VectorDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ bool Tree::allocateBitmapIfNeeded(Cache& cache, int width, int height) { 
#ifndef ANDROID_ENABLE_LINEAR_BLENDING

        sk_sp<SkColorSpace> colorSpace = nullptr;

#else

        sk_sp<SkColorSpace> colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);

        sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);

#endif

        SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType, colorSpace);

        cache.bitmap = Bitmap::allocateHeapBitmap(info);

libs/hwui/hwui/Bitmap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ sk_sp<Bitmap> Bitmap::allocateHardwareBitmap(uirenderer::renderthread::RenderThr 
        return nullptr;

    }



    sk_sp<SkColorSpace> sRGB = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);

    sk_sp<SkColorSpace> sRGB = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);

    bool needSRGB = skBitmap.info().colorSpace() == sRGB.get();

    bool hasSRGB = caches.extensions().hasSRGB();

    GLint format, type, internalFormat;