chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java - Issue 2142263002: Remove ContentViewCore dependency from OverlayPanel

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: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java

Issue 2142263002: Remove ContentViewCore dependency from OverlayPanel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: var name Created 4 years, 5 months 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 | « chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java ('k') | chrome/browser/android/compositor/layer/contextual_search_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java

index 2b08a78fadb8bba8b1acc9aa383642d17ff253d5..bec766fea1cdd2eb93e9036740903ae17beb9ccb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.compositor.scene_layer;

import org.chromium.base.annotations.JNINamespace;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;

-import org.chromium.content.browser.ContentViewCore;

+import org.chromium.content_public.browser.WebContents;

import org.chromium.ui.resources.ResourceManager;

/**

@@ -57,11 +57,14 @@ public class ReaderModeSceneLayer extends SceneOverlayLayer {

mIsInitialized = true;

}

+ WebContents panelWebContents = panel.getContentViewCore() != null

+ ? panel.getContentViewCore().getWebContents() : null;

nativeUpdate(mNativePtr,

mDpToPx,

panel.getBasePageBrightness(),

panel.getBasePageY() * mDpToPx,

- panel.getContentViewCore(),

+ panelWebContents,

panel.getOffsetX() * mDpToPx,

panel.getOffsetY() * mDpToPx,

panel.getWidth() * mDpToPx,

@@ -127,7 +130,7 @@ public class ReaderModeSceneLayer extends SceneOverlayLayer {

float dpToPx,

float basePageBrightness,

float basePageYOffset,

- ContentViewCore contentViewCore,

+ WebContents webContents,

float panelX,

float panelY,

float panelWidth,