android_webview/java/src/org/chromium/android_webview/AwContents.java - Issue 52463004: Block media loading when AwSettings.setBlockNetworkLoads is true.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 52463004: Block media loading when AwSettings.setBlockNetworkLoads is true. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: disable failed test Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java ('k') | android_webview/java/src/org/chromium/android_webview/AwContentsClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java

index 73cce05f3ff210c638119f73eb17bdb41c5471b5..16485ef12c88c6b744df28a6028c2958d1dc957e 100644

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

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

@@ -142,6 +142,7 @@ public class AwContents {

private final ViewGroup mContainerView;

private ContentViewCore mContentViewCore;

private final AwContentsClient mContentsClient;

+ private final AwContentViewClient mContentViewClient;

private final AwContentsClientBridge mContentsClientBridge;

private final AwWebContentsDelegate mWebContentsDelegate;

private final AwContentsIoThreadClient mIoThreadClient;

@@ -497,6 +498,7 @@ public class AwContents {

mContainerView = containerView;

mInternalAccessAdapter = internalAccessAdapter;

mContentsClient = contentsClient;

+ mContentViewClient = new AwContentViewClient(contentsClient, settings);

mLayoutSizer = layoutSizer;

mSettings = settings;

mDIPScale = DeviceDisplayInfo.create(mContainerView.getContext()).getDIPScale();

@@ -582,8 +584,7 @@ public class AwContents {

int nativeWebContents = nativeGetWebContents(mNativeAwContents);

mContentViewCore = createAndInitializeContentViewCore(

mContainerView, mInternalAccessAdapter, nativeWebContents,

- new AwGestureStateListener(), mContentsClient.getContentViewClient(),

- mZoomControls);

+ new AwGestureStateListener(), mContentViewClient, mZoomControls);

nativeSetJavaPeers(mNativeAwContents, this, mWebContentsDelegate, mContentsClientBridge,

mIoThreadClient, mInterceptNavigationDelegate);

mContentsClient.installWebContentsObserver(mContentViewCore);