[WebView] Add a new flushVisualState API to AwContents.

android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java

Index: android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
index c3c381a6bd341a6fe3ed36f069f0ac4c37bbf15c..deafa5ebc721b51b552f08a11fe364a3a6477c9e 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java
@@ -13,9 +13,12 @@ import org.chromium.net.NetError;
  */
 public class AwWebContentsObserver extends WebContentsObserver {
     private final AwContentsClient mAwContentsClient;
+    private final AwContents mAwContents;
 
-    public AwWebContentsObserver(WebContents webContents, AwContentsClient awContentsClient) {
+    public AwWebContentsObserver(WebContents webContents, AwContents awContents,

[mkosiba (inactive), 2015/01/14 18:17:12]

please don't create this cyclic dependency, it just makes it that much harder to
understand how the calls flow. Also, onPageFinished is a massive jumble of
corner cases, let's not use that.

Add this into AwContents

private class AwAwOuchWebContentsOberser extends AwWebContentsObserver {
    @Override
    public void didNavigateMainFrame(String url, ...) {
       super.didNavigate..
       this.AwContents.maybeCompleteFlushVisualState(url);
    }

    public void didFailLoad(boolean isProvisionalLoad, ...) {
       super.didFail...
       this.AwContents.maybeCompleteFlushVisualState(url);
    }
}

[Ignacio Solla, 2015/01/16 16:02:07]

Done. Thanks, good sugestion!

+            AwContentsClient awContentsClient) {
         super(webContents);
+        mAwContents = awContents;
         mAwContentsClient = awContentsClient;
     }
 
@@ -25,7 +28,7 @@ public class AwWebContentsObserver extends WebContentsObserver {
         boolean isErrorUrl =
                 unreachableWebDataUrl != null && unreachableWebDataUrl.equals(validatedUrl);
         if (isMainFrame && !isErrorUrl) {
-            mAwContentsClient.onPageFinished(validatedUrl);
+            onPageFinished(validatedUrl);
         }
     }
 
@@ -49,7 +52,7 @@ public class AwWebContentsObserver extends WebContentsObserver {
             }
             // Need to call onPageFinished after onReceivedError (if there is an error) for
             // backwards compatibility with the classic webview.
-            mAwContentsClient.onPageFinished(failingUrl);
+            onPageFinished(failingUrl);
         }
     }
 
@@ -59,10 +62,15 @@ public class AwWebContentsObserver extends WebContentsObserver {
         // This is here to emulate the Classic WebView firing onPageFinished for main frame
         // navigations where only the hash fragment changes.
         if (isFragmentNavigation) {
-            mAwContentsClient.onPageFinished(url);
+            onPageFinished(url);
         }
     }
 
+    private void onPageFinished(String url) {
+        mAwContentsClient.onPageFinished(url);
+        mAwContents.onPageFinished(url);
+    }
+
     @Override
     public void didNavigateAnyFrame(String url, String baseUrl, boolean isReload) {
         mAwContentsClient.doUpdateVisitedHistory(url, isReload);