Refactor ContentViewClient (1/6)

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.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.ConsoleMessage;
+import android.webkit.URLUtil;
 import android.webkit.ValueCallback;
+import android.webkit.WebChromeClient;
+import android.widget.FrameLayout;
 
 import org.chromium.base.ContentUriUtils;
 import org.chromium.base.ThreadUtils;
+import org.chromium.content.browser.ContentVideoViewEmbedder;
 import org.chromium.content_public.browser.InvalidateTypes;
 import org.chromium.content_public.common.ResourceRequestBody;
 
 /**
  * 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.
  */
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 class AwWebContentsDelegateAdapter extends AwWebContentsDelegate {
     private static final String TAG = "AwWebContentsDelegateAdapter";
 
     private final AwContents mAwContents;
     private final AwContentsClient mContentsClient;
-    private final AwContentViewClient mContentViewClient;
+    private final AwSettings mAwSettings;
     private final Context mContext;
     private View mContainerView;
+    private FrameLayout mCustomView;
+    private AwContentVideoViewEmbedder mVideoViewEmbedder;
 
     public AwWebContentsDelegateAdapter(AwContents awContents, AwContentsClient contentsClient,
-            AwContentViewClient contentViewClient, Context context, View containerView) {
+            AwSettings settings, Context context, View containerView) {
         mAwContents = awContents;
         mContentsClient = contentsClient;
-        mContentViewClient = contentViewClient;
+        mAwSettings = settings;
         mContext = context;
         setContainerView(containerView);
     }
 
     public void setContainerView(View containerView) {
         mContainerView = containerView;
     }
 
     @Override
     public void onLoadProgressChanged(int progress) {
@@ skipping 198 matching lines @@
             // the pending entry.
             String url = mAwContents.getLastCommittedUrl();
             url = TextUtils.isEmpty(url) ? "about:blank" : url;
             mContentsClient.getCallbackHelper().postSynthesizedPageLoadingForUrlBarUpdate(url);
         }
     }
 
     @Override
     public void toggleFullscreenModeForTab(boolean enterFullscreen) {
         if (enterFullscreen) {
-            mContentViewClient.enterFullscreen();
+            enterFullscreen();
         } else {
-            mContentViewClient.exitFullscreen();
+            exitFullscreen();
         }
     }
 
     @Override
     public void loadingStateChanged() {
         mContentsClient.updateTitle(mAwContents.getTitle(), false);
     }
 
+    /**
+     * Called to show the web contents in fullscreen mode.
+     *
+     * <p>If entering fullscreen on a video element the web contents will contain just
+     * the html5 video controls. {@link #enterFullscreenVideo(View)} will be called later
+     * once the ContentVideoView, which contains the hardware accelerated fullscreen video,
+     * is ready to be shown.
+     */
+    public void enterFullscreen() {

[boliu, 2016/09/26 21:25:24]

private

[Jinsuk Kim, 2016/09/27 10:08:58]

Done.

+        if (mAwContents.isFullScreen()) {
+            return;
+        }
+        View fullscreenView = mAwContents.enterFullScreen();
+        if (fullscreenView == null) {
+            return;
+        }
+        WebChromeClient.CustomViewCallback cb = new WebChromeClient.CustomViewCallback() {
+            @Override
+            public void onCustomViewHidden() {
+                if (mCustomView != null) {
+                    mAwContents.requestExitFullscreen();
+                }
+            }
+        };
+        mCustomView = new FrameLayout(mContext);
+        mCustomView.addView(fullscreenView);
+        mContentsClient.onShowCustomView(mCustomView, cb);
+    }
+
+    /**
+     * Called to show the web contents in embedded mode.
+     */
+    public void exitFullscreen() {

[boliu, 2016/09/26 21:25:24]

private

[Jinsuk Kim, 2016/09/27 10:08:58]

Done.

+        if (mCustomView != null) {
+            mCustomView = null;
+            if (mVideoViewEmbedder != null) mVideoViewEmbedder.setCustomView(null);
+            mAwContents.exitFullScreen();
+            mContentsClient.onHideCustomView();
+        }
+    }
+
+    @Override
+    public ContentVideoViewEmbedder getContentVideoViewEmbedder() {
+        mVideoViewEmbedder = new AwContentVideoViewEmbedder(mContext, mContentsClient, mCustomView);
+        return mVideoViewEmbedder;
+    }
+
+    @Override
+    protected boolean shouldBlockMediaRequest(String url) {
+        return mAwSettings != null
+                ? mAwSettings.getBlockNetworkLoads() && URLUtil.isNetworkUrl(url) : true;
+    }
+
     private static class GetDisplayNameTask extends AsyncTask<Void, Void, String[]> {
         final int mProcessId;
         final int mRenderId;
         final int mModeFlags;
         final String[] mFilePaths;
         final ContentResolver mContentResolver;
 
         public GetDisplayNameTask(ContentResolver contentResolver, int processId, int renderId,
                                   int modeFlags, String[] filePaths) {
             mProcessId = processId;
@@ skipping 22 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);
         }
     }
 }