content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h - Issue 1421903006: ui/gl: Move GLImage into gl namespace.

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/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ozone demo Created 5 years, 2 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:

Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

index e3b53a2aacf8fc0119cdd6bdb6a6b9ad4ecdb30e..4ca2b23fdc1922b812e60bed829dfc683d419d63 100644

--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

@@ -12,7 +12,7 @@

#include "gpu/command_buffer/service/image_factory.h"

#include "ui/ozone/public/native_pixmap.h"

-namespace gfx {

+namespace gl {

class GLImage;

}

@@ -47,7 +47,7 @@ class CONTENT_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap

gpu::ImageFactory* AsImageFactory() override;

// Overridden from gpu::ImageFactory:

- scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(

+ scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(

const gfx::GpuMemoryBufferHandle& handle,

const gfx::Size& size,

gfx::BufferFormat format,