| Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| index 4f142196134dec46b971edc1b5ebaaa9435115eb..8dfd5bab7e1b4e201c9b4046bbc3e49c62d5684d 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -240,7 +240,7 @@ public class AwContents {
|
| private CleanupReference mCleanupReference;
|
|
|
| //--------------------------------------------------------------------------------------------
|
| - private class IoThreadClientImpl implements AwContentsIoThreadClient {
|
| + private class IoThreadClientImpl extends AwContentsIoThreadClient {
|
| // All methods are called on the IO thread.
|
|
|
| @Override
|
| @@ -249,20 +249,21 @@ public class AwContents {
|
| }
|
|
|
| @Override
|
| - public InterceptedRequestData shouldInterceptRequest(final String url,
|
| - boolean isMainFrame) {
|
| + public InterceptedRequestData shouldInterceptRequest(
|
| + AwContentsClient.ShouldInterceptRequestParams params) {
|
| + String url = params.url;
|
| InterceptedRequestData interceptedRequestData;
|
| // Return the response directly if the url is default video poster url.
|
| interceptedRequestData = mDefaultVideoPosterRequestHandler.shouldInterceptRequest(url);
|
| if (interceptedRequestData != null) return interceptedRequestData;
|
|
|
| - interceptedRequestData = mContentsClient.shouldInterceptRequest(url);
|
| + interceptedRequestData = mContentsClient.shouldInterceptRequest(params);
|
|
|
| if (interceptedRequestData == null) {
|
| mContentsClient.getCallbackHelper().postOnLoadResource(url);
|
| }
|
|
|
| - if (isMainFrame && interceptedRequestData != null &&
|
| + if (params.isMainFrame && interceptedRequestData != null &&
|
| interceptedRequestData.getData() == null) {
|
| // In this case the intercepted URLRequest job will simulate an empty response
|
| // which doesn't trigger the onReceivedError callback. For WebViewClassic
|
|
|