am 3f8da091: Merge "Change name back to CreateJavaInputStreamAdaptor." into klp-dev (050129b4) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapRegionDecoder.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ static jobject nativeNewInstanceFromStream(JNIEnv* env, jobject clazz,
		jboolean isShareable) {
		jobject brd = NULL;
		// for now we don't allow shareable with java inputstreams
		SkStream* stream = CopyJavaInputStream(env, is, storage);
		SkStreamRewindable* stream = CopyJavaInputStream(env, is, storage);

		if (stream) {
		brd = createBitmapRegionDecoder(env, stream);

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ private:
		friend class RewindableJavaStream;
		};

		SkStream* WrapJavaInputStream(JNIEnv* env, jobject stream,
		SkStream* CreateJavaInputStreamAdaptor(JNIEnv* env, jobject stream,
		jbyteArray storage) {
		static bool gInited;

		@@ -190,6 +190,7 @@ SkStream* WrapJavaInputStream(JNIEnv* env, jobject stream,
		return new JavaInputStreamAdaptor(env, stream, storage);
		}


		static SkMemoryStream* adaptor_to_mem_stream(SkStream* adaptor) {
		SkASSERT(adaptor != NULL);
		SkDynamicMemoryWStream wStream;
		@@ -203,9 +204,9 @@ static SkMemoryStream* adaptor_to_mem_stream(SkStream* adaptor) {
		return new SkMemoryStream(data.get());
		}

		SkMemoryStream* CopyJavaInputStream(JNIEnv* env, jobject stream,
		SkStreamRewindable* CopyJavaInputStream(JNIEnv* env, jobject stream,
		jbyteArray storage) {
		SkAutoTUnref<SkStream> adaptor(WrapJavaInputStream(env, stream, storage));
		SkAutoTUnref<SkStream> adaptor(CreateJavaInputStreamAdaptor(env, stream, storage));
		if (NULL == adaptor.get()) {
		return NULL;
		}
		@@ -302,7 +303,7 @@ static size_t get_length_if_supported(JNIEnv* env, jobject jstream) {

		SkStreamRewindable* GetRewindableStream(JNIEnv* env, jobject stream,
		jbyteArray storage) {
		SkAutoTUnref<SkStream> adaptor(WrapJavaInputStream(env, stream, storage));
		SkAutoTUnref<SkStream> adaptor(CreateJavaInputStreamAdaptor(env, stream, storage));
		if (NULL == adaptor.get()) {
		return NULL;
		}

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h

+7 −10

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ class SkWStream;
		* function returns, since the Java InputStream is not managed
		* by the SkStream.
		*/
		SkStream* WrapJavaInputStream(JNIEnv* env, jobject stream,
		SkStream* CreateJavaInputStreamAdaptor(JNIEnv* env, jobject stream,
		jbyteArray storage);

		/**
		@@ -33,12 +33,10 @@ SkStream* WrapJavaInputStream(JNIEnv* env, jobject stream,
		* @param stream Pointer to Java InputStream.
		* @param storage Java byte array for retrieving data from the
		* Java InputStream.
		* @return SkMemoryStream The data in stream will be copied to a new
		* SkMemoryStream.
		* FIXME: Could return a more generic return type if ViewStateSerializer
		* did not require an SkMemoryStream.
		* @return SkStreamRewindable The data in stream will be copied
		* to a new SkStreamRewindable.
		*/
		SkMemoryStream* CopyJavaInputStream(JNIEnv* env, jobject stream,
		SkStreamRewindable* CopyJavaInputStream(JNIEnv* env, jobject stream,
		jbyteArray storage);

		/**
		@@ -50,7 +48,7 @@ SkMemoryStream* CopyJavaInputStream(JNIEnv* env, jobject stream,
		* @return SkStreamRewindable Either a wrapper around the Java
		* InputStream, if possible, or a copy which is rewindable.
		* Since it may be a wrapper, must not be used after the
		* caller returns, like the result of WrapJavaInputStream.
		* caller returns, like the result of CreateJavaInputStreamAdaptor.
		*/
		SkStreamRewindable* GetRewindableStream(JNIEnv* env, jobject stream,
		jbyteArray storage);
		@@ -69,5 +67,4 @@ android::AssetStreamAdaptor* CheckForAssetStream(JNIEnv* env, jobject stream);

		SkWStream* CreateJavaOutputStreamAdaptor(JNIEnv* env, jobject stream,
		jbyteArray storage);

		#endif

core/jni/android/graphics/Picture.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -39,9 +39,10 @@ public:
		static SkPicture* deserialize(JNIEnv* env, jobject, jobject jstream,
		jbyteArray jstorage) {
		SkPicture* picture = NULL;
		SkAutoTUnref<SkStream> 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;
		}