Special file uris have to be handled in Java.

This depends on: https://android-git.corp.google.com/g/#change,62112

Request an java.io.InputStream from java and queries this for that until all is read.

Change-Id: Ia3e7ad973700bd49be9cae9b432661d61a5470b8

1 files changed, 11 insertions, 0 deletions

diff --git a/WebKit/android/WebCoreSupport/WebRequest.h b/WebKit/android/WebCoreSupport/WebRequest.h
index dc53ca6..b6b3ae2 100644
--- a/WebKit/android/WebCoreSupport/WebRequest.h
+++ b/WebKit/android/WebCoreSupport/WebRequest.h
@@ -42,6 +42,13 @@ class WebRequest : public URLRequest::Delegate, public base::RefCountedThreadSaf
 public:
     WebRequest(WebUrlLoaderClient*, WebResourceRequest);
 
+    // If this is an android specific url we load it with a java input stream
+    // Used for:
+    // - file:///android_asset
+    // - file:///android_res
+    // - content://
+    WebRequest(WebUrlLoaderClient*, WebResourceRequest, int inputStream);
+
     // Optional, but if used has to be called before start
     void AppendBytesToUpload(const char* bytes, int bytesLen);
 
@@ -62,6 +69,7 @@ private:
     virtual ~WebRequest();
     void handleDataURL(GURL);
     void handleBrowserURL(GURL);
+    void handleAndroidURL();
     void finish(bool success);
 
     // Not owned
@@ -69,6 +77,9 @@ private:
 
     OwnPtr<URLRequest> m_request;
     scoped_refptr<net::IOBuffer> m_networkBuffer;
+    int m_inputStream;
+    bool m_androidUrl;
+    std::string m_url;
 };
 
 } // namespace android