content/browser/renderer_host/surface_texture_transport_client_android.h - Issue 11428091: Migrate the Android compositor to cc::Layer classes.

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/renderer_host/surface_texture_transport_client_android.h

Issue 11428091: Migrate the Android compositor to cc::Layer classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years 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 | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/browser/renderer_host/surface_texture_transport_client_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/surface_texture_transport_client_android.h

diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.h b/content/browser/renderer_host/surface_texture_transport_client_android.h

index 26e87c5aab880466538a71d7874a185f736c2d64..50374437465bbbc265315a5e0bb548b181cbcdbc 100644

--- a/content/browser/renderer_host/surface_texture_transport_client_android.h

+++ b/content/browser/renderer_host/surface_texture_transport_client_android.h

@@ -12,9 +12,9 @@

struct ANativeWindow;

-namespace WebKit {

-class WebLayer;

-class WebVideoLayer;

+namespace cc {

+class Layer;

+class VideoLayer;

}

namespace content {

@@ -25,7 +25,7 @@ class SurfaceTextureTransportClient : public WebKit::WebVideoFrameProvider {

SurfaceTextureTransportClient();

virtual ~SurfaceTextureTransportClient();

- WebKit::WebLayer* Initialize();

+ scoped_refptr<cc::Layer> Initialize();

gfx::GLSurfaceHandle GetCompositingSurface(int surface_id);

void SetSize(const gfx::Size& size);

@@ -37,7 +37,7 @@ class SurfaceTextureTransportClient : public WebKit::WebVideoFrameProvider {

private:

void OnSurfaceTextureFrameAvailable();

- scoped_ptr<WebKit::WebVideoLayer> video_layer_;

+ scoped_refptr<cc::VideoLayer> video_layer_;

scoped_refptr<SurfaceTextureBridge> surface_texture_;

ANativeWindow* window_;

scoped_ptr<WebKit::WebVideoFrame> video_frame_;