Allow applications to intercept requests.

The api returns a response containing the mime type, encoding, and an optional
InputStream for reading data.  Move the asset and content url logic into the
new api to consolidate some code.

Requires a change in frameworks/base.

Bug: 2905943
Change-Id: Ic7af410308872042c412aedf62e589f6d2095782

1 files changed, 3 insertions, 2 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.h b/WebKit/android/jni/WebCoreFrameBridge.h
index 2d2b571..027c9ca 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.h
+++ b/WebKit/android/jni/WebCoreFrameBridge.h
@@ -50,6 +50,7 @@ namespace android {
 
 class WebViewCore;
 class WebUrlLoaderClient;
+class UrlInterceptResponse;
 
 // one instance of WebFrame per Page for calling into Java's BrowserFrame
 class WebFrame : public WebCoreRefObject {
@@ -60,12 +61,12 @@ class WebFrame : public WebCoreRefObject {
     // helper function
     static WebFrame* getWebFrame(const WebCore::Frame* frame);
 
-    int inputStreamForAndroidResource(const char* url);
-
     virtual PassRefPtr<WebCore::ResourceLoaderAndroid> startLoadingResource(WebCore::ResourceHandle*,
             const WebCore::ResourceRequest& request, bool mainResource,
             bool synchronous);
 
+    UrlInterceptResponse* shouldInterceptRequest(const WTF::String& url);
+
     void reportError(int errorCode, const WTF::String& description,
             const WTF::String& failingUrl);