WebView: choose loud vs. quiet interstitial

android_webview/java/src/org/chromium/android_webview/AwContents.java

 // Copyright 2012 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.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ComponentCallbacks2;
@@ skipping 41 matching lines @@
 import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;
+import org.chromium.components.safe_browsing.ErrorUiType;
 import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.content.browser.SmartClipProvider;
 import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.content_public.browser.JavaScriptCallback;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.MessagePort;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationHistory;
@@ skipping 2866 matching lines @@
         }
         return false;
     }
 
     /**
      * Determine if it's reasonable to show any sort of interstitial. If the WebView is not visible,
      * the user may not be able to interact with the UI.
      * @return true if the WebView is visible
      */
     @VisibleForTesting
+    @CalledByNative
     protected boolean canShowInterstitial() {
         return mIsAttachedToWindow && mIsViewVisible;
     }
 
+    @CalledByNative
+    private int getErrorUiType() {
+        if (canShowBigInterstitial()) {
+            return ErrorUiType.LOUD;
+        } else if (extendsOutOfWindow()) {
+            return ErrorUiType.QUIET_GIANT;
+        } else {
+            return ErrorUiType.QUIET_SMALL;
+        }
+    }
+
     /**
      * Determine if it's suitable to show the interstitial for browsers and main UIs. If the WebView
      * is close to full-screen, we assume the app is using it as the main UI, so we show the same
      * interstital Chrome uses. Otherwise, we assume the WebView is part of a larger composed page,
      * and will show a different interstitial.
      * @return true if the WebView should display the large interstitial
      */
     @VisibleForTesting
-    @CalledByNative
     protected boolean canShowBigInterstitial() {
         if (!canShowInterstitial()) return false;

[sgurun-gerrit only, 2017/05/23 17:09:15]

I don't think this check is necessary. the caller should verify that by calling
canshowinterstitial. You can add a DCHECK though.

[Nate Fischer, 2017/05/23 20:01:06]

I don't think we can add DCHECKs in Java, so I just removed the conditional. Let
me know if you want the assert, a native DCHECK, or leave as-is without
anything.

[sgurun-gerrit only, 2017/05/23 20:19:23]

just drop, no need.

[Nate Fischer, 2017/05/23 20:21:19]

Ok, SGTM. That's what I did in PS#9

         if (extendsOutOfWindow()) return false;

[sgurun-gerrit only, 2017/05/23 17:09:15]

same as above. 

[Nate Fischer, 2017/05/23 20:01:06]

Done.

 
         double percentOfScreenHeight =
                 (double) mContainerView.getHeight() / mContainerView.getRootView().getHeight();
 
         // Make a guess as to whether the WebView is the predominant part of the UI
         return mContainerView.getWidth() == mContainerView.getRootView().getWidth()
                 && percentOfScreenHeight >= MIN_SCREEN_HEIGHT_PERCENTAGE_FOR_INTERSTITIAL;
     }
 
     @VisibleForTesting
@@ skipping 545 matching lines @@
     private native void nativeTrimMemory(long nativeAwContents, int level, boolean visible);
 
     private native void nativeCreatePdfExporter(long nativeAwContents, AwPdfExporter awPdfExporter);
 
     private native void nativePreauthorizePermission(long nativeAwContents, String origin,
             long resources);
 
     private native void nativeGrantFileSchemeAccesstoChildProcess(long nativeAwContents);
     private native void nativeResumeLoadingCreatedPopupWebContents(long nativeAwContents);
 }