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

Commit c96468b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "update callers to newer Skia APIs"

parents 573cccfe ab12c1fe

core/jni/android/graphics/Bitmap.cpp

+2 −2
Original line number Original line 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);

    std::unique_ptr<SkBitmap> bitmap(new SkBitmap);





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

    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;

        return NULL;

    }

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

    auto bitmapWrapper = reinterpret_cast<BitmapWrapper*>(bitmapHandle);

    bitmapWrapper->getSkBitmap(&bitmap);

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

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





    p->writeInt32(isMutable);

    p->writeInt32(isMutable);

core/jni/android/graphics/Graphics.cpp

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




sk_sp<SkColorSpace> GraphicsJNI::defaultColorSpace() {

sk_sp<SkColorSpace> GraphicsJNI::defaultColorSpace() {

#ifdef ANDROID_ENABLE_LINEAR_BLENDING

#ifdef ANDROID_ENABLE_LINEAR_BLENDING

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

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

#else

#else

    return nullptr;

    return nullptr;

#endif

#endif

libs/hwui/Texture.cpp

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

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

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





    GLint internalFormat, format, type;

    GLint internalFormat, format, type;

libs/hwui/VectorDrawable.cpp

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

#ifndef ANDROID_ENABLE_LINEAR_BLENDING

        sk_sp<SkColorSpace> colorSpace = nullptr;

        sk_sp<SkColorSpace> colorSpace = nullptr;

#else

#else

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

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

#endif

#endif

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

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

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

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

libs/hwui/hwui/Bitmap.cpp

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

        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 needSRGB = skBitmap.info().colorSpace() == sRGB.get();

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

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

    GLint format, type, internalFormat;

    GLint format, type, internalFormat;