[Android WebView] Lay the groundwork for a better onReceivedError

android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java

 // Copyright 2014 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 com.android.webview.chromium;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 569 matching lines @@
     public void onReceivedError(int errorCode, String description, String failingUrl) {
         try {
             TraceEvent.begin("WebViewContentsClientAdapter.onReceivedError");
             if (description == null || description.isEmpty()) {
                 // ErrorStrings is @hidden, so we can't do this in AwContents.  Normally the net/
                 // layer will set a valid description, but for synthesized callbacks (like in the
                 // case for intercepted requests) AwContents will pass in null.
                 description = mWebViewDelegate.getErrorString(mContext, errorCode);
             }
             if (TRACE) Log.d(TAG, "onReceivedError=" + failingUrl);
-            mWebViewClient.onReceivedError(mWebView, errorCode, description, failingUrl);
+            // TODO(mnaganov): In the next version of glue, this will look as follows:
+            // if (!<next-level-api>) {
+            //   mWebViewClient.onReceivedError(mWebView, errorCode, description, failingUrl);
+            // }
+            mWebViewClient.onReceivedError(
+                    mWebView, errorCode, description, failingUrl);
         } finally {
             TraceEvent.end("WebViewContentsClientAdapter.onReceivedError");
         }
     }
 
     /**
+     * @see ContentViewClient#onReceivedError(
+     * AwContentsClient.AwWebResourceRequest,AwContentsClient.AwWebResourceError)
+     */
+    @Override
+    public void onReceivedError2(AwContentsClient.AwWebResourceRequest request,
+            AwContentsClient.AwWebResourceError error) {
+        try {
+            TraceEvent.begin("WebViewContentsClientAdapter.onReceivedError2");
+            if (error.description == null || error.description.isEmpty()) {
+                // ErrorStrings is @hidden, so we can't do this in AwContents.  Normally the net/
+                // layer will set a valid description, but for synthesized callbacks (like in the
+                // case for intercepted requests) AwContents will pass in null.
+                error.description = mWebViewDelegate.getErrorString(mContext, error.errorCode);

[Torne, 2015/03/09 16:00:36]

Is this costly at all? We might want to only do it if we're on the right API
level since for now this whole callback is going nowhere.

[mnaganov (inactive), 2015/03/09 16:53:39]

It goes into some reflection bullsh*t, so indeed let's avoid it. Actually, in
the meantime, I was thinking that since it is always only one of these two
methods that takes action, there are no reasons for not doing an early fallback
depending on the API level at the very beginning of both methods.

+            }
+            if (TRACE) Log.d(TAG, "onReceivedError2=" + request.url);
+            // TODO(mnaganov): In the next version of glue, this will look as follows:
+            // if (<next-level-api>) {
+            //   mWebViewClient.onReceivedError(request, error);
+            // }
+        } finally {
+            TraceEvent.end("WebViewContentsClientAdapter.onReceivedError2");
+        }
+    }
+
+    /**
      * @see ContentViewClient#onReceivedTitle(String)
      */
     @Override
     public void onReceivedTitle(String title) {
         try {
             TraceEvent.begin("WebViewContentsClientAdapter.onReceivedTitle");
             if (mWebChromeClient != null) {
                 if (TRACE) Log.d(TAG, "onReceivedTitle");
                 mWebChromeClient.onReceivedTitle(mWebView, title);
             }
@@ skipping 639 matching lines @@
             else
                 mAwPermissionRequest.deny();
         }
 
         @Override
         public void deny() {
             mAwPermissionRequest.deny();
         }
     }
 }