From c7797525084ba0ea441e394aa0a2ba35d6ff3320 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 3 Sep 2013 11:35:00 -0400 Subject: Change name back to CreateJavaInputStreamAdaptor. In order to fix open source builds, change WrapJavaInputStream's name back to CreateJavaInputStreamAdaptor. Remove FIXME in CopyJavaInputStream, and return a more generic type, since the more specific type was only needed by a change in external/webkit, which is being reverted since it depends on unreleased code. Change-Id: I89b0431e357b509a2a0c17a624b31bd49d29070f --- core/jni/android/graphics/Picture.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/jni/android/graphics/Picture.cpp') diff --git a/core/jni/android/graphics/Picture.cpp b/core/jni/android/graphics/Picture.cpp index dff2b18..fcf22b8 100644 --- a/core/jni/android/graphics/Picture.cpp +++ b/core/jni/android/graphics/Picture.cpp @@ -39,9 +39,10 @@ public: static SkPicture* deserialize(JNIEnv* env, jobject, jobject jstream, jbyteArray jstorage) { SkPicture* picture = NULL; - SkAutoTUnref strm(WrapJavaInputStream(env, jstream, jstorage)); - if (strm.get()) { - picture = SkPicture::CreateFromStream(strm.get()); + SkStream* strm = CreateJavaInputStreamAdaptor(env, jstream, jstorage); + if (strm) { + picture = SkPicture::CreateFromStream(strm); + delete strm; } return picture; } -- cgit v1.1