cc/trees/layer_tree_host_impl.cc - Issue 177953004: Enable SurfaceTexture based zero-copy texture uploading on Android platform

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: cc/trees/layer_tree_host_impl.cc

Issue 177953004: Enable SurfaceTexture based zero-copy texture uploading on Android platform Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 10 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

« cc/resources/resource_provider.cc ('K') | « cc/resources/resource_provider.cc ('k') | content/app/android/child_process_service.cc » ('j') | content/app/android/child_process_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/trees/layer_tree_host_impl.cc

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc

index e8155dd92037857b1194fa6918776d2c8fae88e8..8eed544268d625f6837f73f88c7def3a9a9a9293 100644

--- a/cc/trees/layer_tree_host_impl.cc

+++ b/cc/trees/layer_tree_host_impl.cc

@@ -111,12 +111,12 @@ unsigned GetMapImageTextureTarget(cc::ContextProvider* context_provider) {

// TODO(reveman): Determine if GL_TEXTURE_EXTERNAL_OES works well on

// Android before we enable this. crbug.com/322780

-#if !defined(OS_ANDROID)

+ // #if !defined(OS_ANDROID)

reveman 2014/02/26 08:02:34 Someone needs to take ownership of crbug.com/32278

if (context_provider->ContextCapabilities().gpu.egl_image_external)

return GL_TEXTURE_EXTERNAL_OES;

if (context_provider->ContextCapabilities().gpu.texture_rectangle)

return GL_TEXTURE_RECTANGLE_ARB;

-#endif

+ // #endif

return GL_TEXTURE_2D;

}

« cc/resources/resource_provider.cc ('K') | « cc/resources/resource_provider.cc ('k') | content/app/android/child_process_service.cc » ('j') | content/app/android/child_process_service.cc » ('J')