Removing ContentViewCore dependencies from direct WebContents functions.

android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.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.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.ConsoleMessage;
 import android.webkit.ValueCallback;
 
 import org.chromium.base.ContentUriUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.ContentVideoView;
-import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content_public.browser.WebContents;
 
 /**
  * Adapts the AwWebContentsDelegate interface to the AwContentsClient interface.
  * This class also serves a secondary function of routing certain callbacks from the content layer
  * to specific listener interfaces.
  */
 class AwWebContentsDelegateAdapter extends AwWebContentsDelegate {
     private static final String TAG = "AwWebContentsDelegateAdapter";
 
     final AwContentsClient mContentsClient;
@@ skipping 94 matching lines @@
         // This is only called in chrome layers.
         assert false;
     }
 
     @Override
     public void closeContents() {
         mContentsClient.onCloseWindow();
     }
 
     @Override
-    public void showRepostFormWarningDialog(final ContentViewCore contentViewCore) {
+    public void showRepostFormWarningDialog(final WebContents webContents) {
         // TODO(mkosiba) We should be using something akin to the JsResultReceiver as the
         // callback parameter (instead of ContentViewCore) and implement a way of converting
         // that to a pair of messages.
         final int msgContinuePendingReload = 1;
         final int msgCancelPendingReload = 2;
 
         // TODO(sgurun) Remember the URL to cancel the reload behavior
         // if it is different than the most recent NavigationController entry.
         final Handler handler = new Handler(ThreadUtils.getUiThreadLooper()) {
             @Override
             public void handleMessage(Message msg) {
-                if (contentViewCore.getWebContents() == null) return;
+                if (webContents == null) return;

[boliu, 2014/10/09 17:10:04]

This isn't the same check anymore.

This was meant to check whether ContentViewCore was already destroyed or not,
after which point calling into into methods for
ContentViewCore/WebContents/NavigationController will just crash.

It's kinda weird this is the only callback that gets passed a WebContents. I
think we should remove the parameter from the callback. This object can hold
onto an AwContents and get WebContents from that.

Might be easier to make this as a separate CL and submit that first before this
huge refactor.

[AKVT, 2014/10/11 10:51:59]

Done.

 
                 switch(msg.what) {
                     case msgContinuePendingReload: {
-                        contentViewCore.getWebContents().getNavigationController()
-                                .continuePendingReload();
+                        webContents.getNavigationController().continuePendingReload();
                         break;
                     }
                     case msgCancelPendingReload: {
-                        contentViewCore.getWebContents().getNavigationController()
-                                .cancelPendingReload();
+                        webContents.getNavigationController().cancelPendingReload();
                         break;
                     }
                     default:
                         throw new IllegalStateException(
                                 "WebContentsDelegateAdapter: unhandled message " + msg.what);
                 }
             }
         };
 
         Message resend = handler.obtainMessage(msgContinuePendingReload);
@@ skipping 84 matching lines @@
          * or an empty string otherwise.
          */
         private String resolveFileName(String filePath) {
             if (mContentResolver == null || filePath == null) return "";
             Uri uri = Uri.parse(filePath);
             return ContentUriUtils.getDisplayName(
                     uri, mContentResolver, MediaStore.MediaColumns.DISPLAY_NAME);
         }
     }
 }