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

Commit 96f0369b authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Update framework to enable Skia to run in debug mode."

parents 40c3ddd3 2d5cf4f6

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static jobject Bitmap_extractAlpha(JNIEnv* env, jobject clazz, 
    }



    return GraphicsJNI::createBitmap(env, dst, allocator.getStorageObj(),

            GraphicsJNI::kBitmapCreateFlag_Mutable, NULL, NULL);

            getPremulBitmapCreateFlags(true), NULL, NULL);

}



///////////////////////////////////////////////////////////////////////////////

core/jni/android/graphics/Utils.cpp

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ bool AssetStreamAdaptor::isAtEnd() const { 
}



SkStreamRewindable* AssetStreamAdaptor::duplicate() const {

    SkASSERT(false);

    // Cannot create a duplicate, since each AssetStreamAdaptor

    // would be modifying the Asset.

    //return new AssetStreamAdaptor(fAsset);