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

Commit b2e6adbf authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Move Bitmap to AParcel"

parents 68b1fe2c a18d7c8e

libs/hwui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ cc_defaults { 
                "libstatspull",

                "libstatssocket",

                "libpdfium",

                "libbinder_ndk",

            ],

            static_libs: [

                "libgif",

libs/hwui/hwui/Bitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public: 
    static sk_sp<Bitmap> allocateHardwareBitmap(const SkBitmap& bitmap);

    static sk_sp<Bitmap> allocateHeapBitmap(SkBitmap* bitmap);

    static sk_sp<Bitmap> allocateHeapBitmap(const SkImageInfo& info);

    static sk_sp<Bitmap> allocateHeapBitmap(size_t size, const SkImageInfo& i, size_t rowBytes);



    /* The createFrom factories construct a new Bitmap object by wrapping the already allocated

     * memory that is provided as an input param.
@@ -160,7 +161,6 @@ public: 
                       int32_t quality, SkWStream* stream);

private:

    static sk_sp<Bitmap> allocateAshmemBitmap(size_t size, const SkImageInfo& i, size_t rowBytes);

    static sk_sp<Bitmap> allocateHeapBitmap(size_t size, const SkImageInfo& i, size_t rowBytes);



    Bitmap(void* address, size_t allocSize, const SkImageInfo& info, size_t rowBytes);

    Bitmap(void* address, void* context, FreeFunc freeFunc, const SkImageInfo& info,

libs/hwui/jni/Bitmap.cpp

+269 −147

File changed.

Preview size limit exceeded, changes collapsed.