content/browser/android/content_view_core_impl.h - 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/browser/android/content_view_core_impl.h

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

Patch Set: Plumb compositor provider through instead of compositor 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 | « chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java ('k') | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/renderer_host/render_widget_host_view_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_view_core_impl.h

diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h

index e58b7d2e8c7defdd7137d98e3baaf7fe1450645b..cc77f8b1a789dbda03f636f3ac7ee21bbe7c0c89 100644

--- a/content/browser/android/content_view_core_impl.h

+++ b/content/browser/android/content_view_core_impl.h

@@ -32,6 +32,7 @@ class WindowAndroid;

namespace content {

class RenderWidgetHostViewAndroid;

+class CompositorProvider;

struct MenuItem;

// TODO(jrg): this is a shell. Upstream the rest.

@@ -45,7 +46,8 @@ class ContentViewCoreImpl : public ContentViewCore,

bool hardware_accelerated,

WebContents* web_contents,

ui::ViewAndroid* view_android,

- ui::WindowAndroid* window_android);

+ ui::WindowAndroid* window_android,

+ CompositorProvider* compositor_provider);

// ContentViewCore implementation.

virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;

@@ -387,6 +389,9 @@ class ContentViewCoreImpl : public ContentViewCore,

// will be sent to Renderer once it is ready.

int device_orientation_;

+ // ContentViewCore does not own the compositor provider.

+ CompositorProvider* compositor_provider_;

DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);

};