content/content_common.gypi - Issue 10695020: upstream SurfaceTextureListener and SurfaceTextureBridge class for android

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/content_common.gypi

Issue 10695020: upstream SurfaceTextureListener and SurfaceTextureBridge class for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixing nits Created 8 years, 6 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

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index b0a61930f38ac99aa560c2a74cc2264c719f0be1..d3fce9a66d86ab56562420738a137f4960c1d447 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -104,6 +104,10 @@

'common/android/command_line.h',

'common/android/surface_callback.cc',

'common/android/surface_callback.h',

+ 'common/android/surface_texture_bridge.cc',

+ 'common/android/surface_texture_bridge.h',

+ 'common/android/surface_texture_listener.cc',

+ 'common/android/surface_texture_listener.h',

'common/android/surface_texture_peer.cc',

'common/android/surface_texture_peer.h',

'common/android/trace_event_binding.cc',

@@ -197,6 +201,8 @@

'common/gpu/gpu_memory_manager.h',

'common/gpu/gpu_messages.h',

'common/gpu/gpu_process_launch_causes.h',

+ 'common/gpu/stream_texture_manager_android.cc',

+ 'common/gpu/stream_texture_manager_android.h',

'common/gpu/gpu_watchdog.h',

'common/gpu/image_transport_surface.h',

'common/gpu/image_transport_surface.cc',

« content/common/gpu/stream_texture_manager_android.cc ('K') | « content/common/gpu/stream_texture_manager_android.cc ('k') | content/content_jni.gypi » ('j') | no next file with comments »