[android_webview] Don't block the IO thread when reading from an InputStream.

android_webview/native/android_protocol_handler.cc

 // 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.
 
-// URL request job for reading from resources and assets.
-
 #include "android_webview/native/android_protocol_handler.h"
 
+#include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/common/url_constants.h"
-#include "android_webview/native/android_stream_reader_url_request_job.h"
+#include "android_webview/native/input_stream_impl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/android/jni_string.h"
 #include "base/string_util.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "jni/AndroidProtocolHandler_jni.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory.h"
 
+using android_webview::InputStream;
+using android_webview::InputStreamImpl;
 using base::android::AttachCurrentThread;
 using base::android::ClearException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
 
 // Override resource context for reading resource and asset files. Used for
 // testing.
 JavaObjectWeakGlobalRef* g_resource_context = NULL;
 
 void ResetResourceContext(JavaObjectWeakGlobalRef* ref) {
   if (g_resource_context)
     delete g_resource_context;
 
   g_resource_context = ref;
 }
 
 class AndroidStreamReaderURLRequestJobDelegateImpl
     : public AndroidStreamReaderURLRequestJob::Delegate {
  public:
   AndroidStreamReaderURLRequestJobDelegateImpl();
 
-  virtual ScopedJavaLocalRef<jobject> OpenInputStream(
+  virtual scoped_ptr<InputStream> OpenInputStream(
       JNIEnv* env,
       net::URLRequest* request) OVERRIDE;
 
   virtual bool GetMimeType(JNIEnv* env,
                            net::URLRequest* request,
-                           jobject stream,
+                           const InputStream& stream,
                            std::string* mime_type) OVERRIDE;
 
   virtual bool GetCharset(JNIEnv* env,
                           net::URLRequest* request,
-                          jobject stream,
+                          const InputStream& stream,
                           std::string* charset) OVERRIDE;
 
   virtual ~AndroidStreamReaderURLRequestJobDelegateImpl();
 };
 
 class AssetFileProtocolInterceptor :
       public net::URLRequestJobFactory::Interceptor {
  public:
   AssetFileProtocolInterceptor();
   virtual ~AssetFileProtocolInterceptor() OVERRIDE;
@@ skipping 45 matching lines @@
 }
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
 AndroidStreamReaderURLRequestJobDelegateImpl() {
 }
 
 AndroidStreamReaderURLRequestJobDelegateImpl::
 ~AndroidStreamReaderURLRequestJobDelegateImpl() {
 }
 
-ScopedJavaLocalRef<jobject>
+scoped_ptr<InputStream>
 AndroidStreamReaderURLRequestJobDelegateImpl::OpenInputStream(
     JNIEnv* env, net::URLRequest* request) {
   DCHECK(request);
   DCHECK(env);
 
   // Open the input stream.
   ScopedJavaLocalRef<jstring> url =
       ConvertUTF8ToJavaString(env, request->url().spec());
   ScopedJavaLocalRef<jobject> stream =
       android_webview::Java_AndroidProtocolHandler_open(
           env,
           GetResourceContext(env).obj(),
           url.obj());
 
   // Check and clear pending exceptions.
   if (ClearException(env) || stream.is_null()) {
     DLOG(ERROR) << "Unable to open input stream for Android URL";
-    return ScopedJavaLocalRef<jobject>(env, NULL);
+    return scoped_ptr<InputStream>();
   }
-  return stream;
+  return make_scoped_ptr<InputStream>(new InputStreamImpl(stream));
 }
 
 bool AndroidStreamReaderURLRequestJobDelegateImpl::GetMimeType(
     JNIEnv* env,
     net::URLRequest* request,
-    jobject stream,
+    const android_webview::InputStream& stream,
     std::string* mime_type) {
   DCHECK(env);
   DCHECK(request);
   DCHECK(mime_type);
 
-  if (!stream)
-    return false;
-
   // Query the mime type from the Java side. It is possible for the query to
   // fail, as the mime type cannot be determined for all supported schemes.
   ScopedJavaLocalRef<jstring> url =
       ConvertUTF8ToJavaString(env, request->url().spec());
+  const InputStreamImpl* stream_impl =
+      InputStreamImpl::FromInputStream(&stream);
   ScopedJavaLocalRef<jstring> returned_type =
       android_webview::Java_AndroidProtocolHandler_getMimeType(
           env,
           GetResourceContext(env).obj(),
-          stream, url.obj());
+          stream_impl->jobj(), url.obj());
   if (ClearException(env) || returned_type.is_null())
     return false;
 
   *mime_type = base::android::ConvertJavaStringToUTF8(returned_type);
   return true;
 }
 
 bool AndroidStreamReaderURLRequestJobDelegateImpl::GetCharset(
     JNIEnv* env,
     net::URLRequest* request,
-    jobject stream,
+    const android_webview::InputStream& stream,
     std::string* charset) {
   // TODO: We should probably be getting this from the managed side.
   return false;
 }
 
 AssetFileProtocolInterceptor::AssetFileProtocolInterceptor()
     : asset_prefix_(std::string(chrome::kFileScheme) +
                     std::string(content::kStandardSchemeSeparator) +
                     android_webview::kAndroidAssetPath),
       resource_prefix_(std::string(chrome::kFileScheme) +
@@ skipping 79 matching lines @@
       env, android_webview::kAndroidAssetPath).Release();
 }
 
 static jstring GetAndroidResourcePath(JNIEnv* env, jclass /*clazz*/) {
   // OK to release, JNI binding.
   return ConvertUTF8ToJavaString(
       env, android_webview::kAndroidResourcePath).Release();
 }
 
 }  // namespace android_webview