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

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

Patch Set: rebase 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/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellUrlTest.java ('k') | content/browser/android/content_view_render_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_view_render_view.h

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

index 65c3874a66fc8e5f3bc03c9572dbc224f0195fba..1bd3899ac3c439b2cf0b69e4985190da79203e91 100644

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

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

@@ -10,6 +10,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "content/public/browser/android/compositor_client.h"

+#include "ui/gfx/native_widget_types.h"

namespace content {

class Compositor;

@@ -19,7 +20,9 @@ class ContentViewRenderView : public CompositorClient {

// Registers the JNI methods for ContentViewRender.

static bool RegisterContentViewRenderView(JNIEnv* env);

- ContentViewRenderView(JNIEnv* env, jobject obj);

+ ContentViewRenderView(JNIEnv* env,

+ jobject obj,

+ gfx::NativeWindow root_window);

// Methods called from Java via JNI -----------------------------------------

void Destroy(JNIEnv* env, jobject obj);

@@ -46,6 +49,8 @@ class ContentViewRenderView : public CompositorClient {

scoped_ptr<content::Compositor> compositor_;

+ gfx::NativeWindow root_window_;

DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);

};