Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2145)

Unified Diff: android_webview/native/input_stream_impl.cc

Issue 11363123: [android_webview] Don't block the IO thread when reading from an InputStream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reinterpret_cast->static_cast Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/native/input_stream_impl.cc
diff --git a/android_webview/native/input_stream_impl.cc b/android_webview/native/input_stream_impl.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8b2cf78ceae31b94ef3773d5065449fbff2ab156
--- /dev/null
+++ b/android_webview/native/input_stream_impl.cc
@@ -0,0 +1,113 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "android_webview/native/input_stream_impl.h"
+
+#include "base/android/jni_android.h"
+#include "net/base/io_buffer.h"
+// Disable "Warnings treated as errors" for input_stream_jni as it's a Java
+// system class and we have to generate C++ hooks for all methods in the class
+// even if they're unused.
+#pragma GCC diagnostic ignored "-Wunused-function"
+#include "jni/InputStream_jni.h"
+
+using base::android::ClearException;
+using base::android::JavaRef;
+using JNI_InputStream::Java_InputStream_available;
+using JNI_InputStream::Java_InputStream_skip;
+using JNI_InputStream::Java_InputStream_readI_AB_I_I;
+
+namespace android_webview {
+
+bool RegisterInputStream(JNIEnv* env) {
+ return JNI_InputStream::RegisterNativesImpl(env);
+}
+
+// Maximum number of bytes to be read in a single read.
+const int InputStreamImpl::kBufferSize = 4096;
+
+//static
+const InputStreamImpl* InputStreamImpl::FromInputStream(
+ const InputStream* input_stream) {
+ return static_cast<const InputStreamImpl*>(input_stream);
+}
+
+InputStreamImpl::InputStreamImpl() {
+}
+
+InputStreamImpl::InputStreamImpl(const JavaRef<jobject>& stream)
+ : jobject_(stream) {
+ DCHECK(!stream.is_null());
+}
+
+InputStreamImpl::~InputStreamImpl() {
+}
+
+bool InputStreamImpl::BytesAvailable(JNIEnv* env,
+ int* bytes_available) const {
+ // TODO: Use unsafe version once BUG 157880 is fixed.
+ int bytes = Java_InputStream_available(env, jobject_.obj());
+ if (ClearException(env))
+ return false;
+ *bytes_available = bytes;
+ return true;
+}
+
+bool InputStreamImpl::Skip(JNIEnv* env,
+ int64_t n,
+ int64_t* bytes_skipped) {
+ // TODO: Use unsafe version once BUG 157880 is fixed.
+ int bytes = Java_InputStream_skip(env, jobject_.obj(), n);
+ if (ClearException(env))
+ return false;
+ *bytes_skipped = bytes;
+ return true;
+}
+
+bool InputStreamImpl::Read(JNIEnv* env,
+ net::IOBuffer* dest,
+ int length,
+ int* bytes_read) {
+ if (!buffer_.obj()) {
+ // Allocate transfer buffer.
+ buffer_.Reset(env, env->NewByteArray(kBufferSize));
+ if (ClearException(env))
+ return false;
+ }
+
+ jbyteArray buffer = buffer_.obj();
+ int read_size = std::min(length, kBufferSize);
+ *bytes_read = 0;
+
+ while (length > 0) {
+ int32_t byte_count =
+ Java_InputStream_readI_AB_I_I(
+ env, jobject_.obj(), buffer, 0, read_size);
+
+ if (ClearException(env))
+ return false;
+
+ if (byte_count <= 0)
+ break;
+
+#ifndef NDEBUG
+ int32_t buffer_length = env->GetArrayLength(buffer);
+ DCHECK_GE(read_size, byte_count);
+ DCHECK_GE(buffer_length, byte_count);
+#endif // NDEBUG
+
+ // Copy the data over to the provided C++ side buffer.
+ DCHECK_GE(length, byte_count);
+ env->GetByteArrayRegion(buffer, 0, byte_count,
+ reinterpret_cast<jbyte*>(dest->data() + *bytes_read));
+ if (ClearException(env))
+ return false;
+
+ *bytes_read += byte_count;
+ length -= byte_count;
+ }
+ return true;
+}
+
+} // namespace android_webview

Powered by Google App Engine
This is Rietveld 408576698