ui/gl/gl_image_android.cc - Issue 212933009: ui: Refactor GLImageEGL for usage by targets other than EGL_NATIVE_BUFFER_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: ui/gl/gl_image_android.cc

Issue 212933009: ui: Refactor GLImageEGL for usage by targets other than EGL_NATIVE_BUFFER_ANDROID. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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: ui/gl/gl_image_android.cc

diff --git a/ui/gl/gl_image_android.cc b/ui/gl/gl_image_android.cc

index e56dc2d074be63a8f961fa24c958c44963c46c7f..4d04be1a4c1d8ccffed057902404283833cf8e4a 100644

--- a/ui/gl/gl_image_android.cc

+++ b/ui/gl/gl_image_android.cc

@@ -5,7 +5,7 @@

#include "ui/gl/gl_image.h"

#include "base/debug/trace_event.h"

-#include "ui/gl/gl_image_egl.h"

+#include "ui/gl/gl_image_android_native_buffer.h"

#include "ui/gl/gl_image_shm.h"

#include "ui/gl/gl_image_stub.h"

#include "ui/gl/gl_implementation.h"

@@ -41,8 +41,9 @@ scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(

return image;

}

- case EGL_CLIENT_BUFFER: {

- scoped_refptr<GLImageEGL> image(new GLImageEGL(size));

+ case ANDROID_NATIVE_BUFFER: {

+ scoped_refptr<GLImageAndroidNativeBuffer> image(

+ new GLImageAndroidNativeBuffer(size));

if (!image->Initialize(buffer))

return NULL;

« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/gl/gl_image_android_native_buffer.h » ('j') | ui/gl/gl_image_android_native_buffer.cc » ('J')