[Android WebView] Lay the groundwork for a better onReceivedError

android_webview/java/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java

 // Copyright 2013 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.
 
 package org.chromium.android_webview;
 
 import android.graphics.Picture;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ skipping 41 matching lines @@
         final String mArgs;
 
         LoginRequestInfo(String realm, String account, String args) {
             mRealm = realm;
             mAccount = account;
             mArgs = args;
         }
     }
 
     private static class OnReceivedErrorInfo {
-        final int mErrorCode;
-        final String mDescription;
-        final String mFailingUrl;
+        final AwContentsClient.AwWebResourceRequest mRequest;
+        final AwContentsClient.AwWebResourceError mError;
 
-        OnReceivedErrorInfo(int errorCode, String description, String failingUrl) {
-            mErrorCode = errorCode;
-            mDescription = description;
-            mFailingUrl = failingUrl;
+        OnReceivedErrorInfo(AwContentsClient.AwWebResourceRequest request,
+                AwContentsClient.AwWebResourceError error) {
+            mRequest = request;
+            mError = error;
         }
     }
 
     private static final int MSG_ON_LOAD_RESOURCE = 1;
     private static final int MSG_ON_PAGE_STARTED = 2;
     private static final int MSG_ON_DOWNLOAD_START = 3;
     private static final int MSG_ON_RECEIVED_LOGIN_REQUEST = 4;
     private static final int MSG_ON_RECEIVED_ERROR = 5;
     private static final int MSG_ON_NEW_PICTURE = 6;
     private static final int MSG_ON_SCALE_CHANGED_SCALED = 7;
@@ skipping 33 matching lines @@
                             info.mContentDisposition, info.mMimeType, info.mContentLength);
                     break;
                 }
                 case MSG_ON_RECEIVED_LOGIN_REQUEST: {
                     LoginRequestInfo info = (LoginRequestInfo) msg.obj;
                     mContentsClient.onReceivedLoginRequest(info.mRealm, info.mAccount, info.mArgs);
                     break;
                 }
                 case MSG_ON_RECEIVED_ERROR: {
                     OnReceivedErrorInfo info = (OnReceivedErrorInfo) msg.obj;
-                    mContentsClient.onReceivedError(info.mErrorCode, info.mDescription,
-                            info.mFailingUrl);
+                    mContentsClient.onReceivedError(info.mRequest, info.mError);
                     break;
                 }
                 case MSG_ON_NEW_PICTURE: {
                     Picture picture = null;
                     try {
                         if (msg.obj != null) picture = (Picture) ((Callable<?>) msg.obj).call();
                     } catch (Exception e) {
                         throw new RuntimeException("Error getting picture", e);
                     }
                     mContentsClient.onNewPicture(picture);
@@ skipping 32 matching lines @@
         DownloadInfo info = new DownloadInfo(url, userAgent, contentDisposition, mimeType,
                 contentLength);
         mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_DOWNLOAD_START, info));
     }
 
     public void postOnReceivedLoginRequest(String realm, String account, String args) {
         LoginRequestInfo info = new LoginRequestInfo(realm, account, args);
         mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_RECEIVED_LOGIN_REQUEST, info));
     }
 
-    public void postOnReceivedError(int errorCode, String description, String failingUrl) {
-        OnReceivedErrorInfo info = new OnReceivedErrorInfo(errorCode, description, failingUrl);
+    public void postOnReceivedError(AwContentsClient.AwWebResourceRequest request,
+            AwContentsClient.AwWebResourceError error) {
+        OnReceivedErrorInfo info = new OnReceivedErrorInfo(request, error);
         mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_RECEIVED_ERROR, info));
     }
 
     public void postOnNewPicture(Callable<Picture> pictureProvider) {
         if (mHasPendingOnNewPicture) return;
         mHasPendingOnNewPicture = true;
         long pictureTime = java.lang.Math.max(mLastPictureTime + ON_NEW_PICTURE_MIN_PERIOD_MILLIS,
                 SystemClock.uptimeMillis());
         mHandler.sendMessageAtTime(mHandler.obtainMessage(MSG_ON_NEW_PICTURE, pictureProvider),
                 pictureTime);
     }
 
     public void postOnScaleChangedScaled(float oldScale, float newScale) {
         // The float->int->float conversion here is to avoid unnecessary allocations. The
         // documentation states that intBitsToFloat(floatToIntBits(a)) == a for all values of a
         // (except for NaNs which are collapsed to a single canonical NaN, but we don't care for
         // that case).
         mHandler.sendMessage(mHandler.obtainMessage(MSG_ON_SCALE_CHANGED_SCALED,
                     Float.floatToIntBits(oldScale), Float.floatToIntBits(newScale)));
     }
 }