content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java - Issue 26753005: Adding compositor callbacks to RenderWidgetHostViewAndroid

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: content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

Issue 26753005: Adding compositor callbacks to RenderWidgetHostViewAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed blank lines Created 7 years, 2 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

« content/browser/renderer_host/render_widget_host_view_android.cc ('K') | « content/content_browser.gypi ('k') | content/public/browser/android/compositor.h » ('j') | content/public/browser/android/compositor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

index 5b3cd356dcbb8fd05fb56427aa9a9d5f348c71a0..f2244152eaeac9c8657ea85131b0800d081ccb6f 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

@@ -171,6 +171,14 @@ public class ContentViewRenderView extends FrameLayout {

public void setCurrentContentView(ContentView contentView) {

assert mNativeContentViewRenderView != 0;

+ if (mCurrentContentView != contentView) {

+ ContentViewCore oldContentViewCore =

+ contentView != null ? mCurrentContentView.getContentViewCore() : null;

+ nativeRemovePreviousContentView(mNativeContentViewRenderView,

+ oldContentViewCore != null ? oldContentViewCore.getNativeContentViewCore() : 0);

+ }

mCurrentContentView = contentView;

ContentViewCore contentViewCore =

@@ -271,6 +279,8 @@ public class ContentViewRenderView extends FrameLayout {

private native void nativeDestroy(int nativeContentViewRenderView);

private native void nativeSetCurrentContentView(int nativeContentViewRenderView,

int nativeContentView);

+ private native void nativeRemovePreviousContentView(int nativeContentViewRenderView,

+ int nativeContentView);

private native void nativeSurfaceCreated(int nativeContentViewRenderView, Surface surface);

private native void nativeSurfaceDestroyed(int nativeContentViewRenderView);

private native void nativeSurfaceSetSize(int nativeContentViewRenderView,