Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(837)

Unified Diff: content/browser/gpu/browser_gpu_memory_buffer_manager.cc

Issue 1240353002: ozone: rename to GpuMemoryBuffer(Factory|Impl)OzoneNativePixmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nits in comments Created 5 years, 5 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
« no previous file with comments | « no previous file | content/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/browser_gpu_memory_buffer_manager.cc
diff --git a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
index 51e08cb2bff7f131231d7a39d22fdcdc87114aee..f428c6d0ff77433d53e80772374f846920dfc214 100644
--- a/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
+++ b/content/browser/gpu/browser_gpu_memory_buffer_manager.cc
@@ -30,7 +30,7 @@
#endif
#if defined(USE_OZONE)
-#include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"
+#include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"
#endif
namespace content {
@@ -65,8 +65,8 @@ bool IsGpuMemoryBufferFactoryConfigurationSupported(
configuration.usage);
#endif
#if defined(USE_OZONE)
- case gfx::OZONE_NATIVE_BUFFER:
- return GpuMemoryBufferFactoryOzoneNativeBuffer::
+ case gfx::OZONE_NATIVE_PIXMAP:
+ return GpuMemoryBufferFactoryOzoneNativePixmap::
IsGpuMemoryBufferConfigurationSupported(configuration.format,
configuration.usage);
#endif
@@ -178,7 +178,7 @@ uint32 BrowserGpuMemoryBufferManager::GetImageTextureTarget(
switch (type) {
case gfx::SURFACE_TEXTURE_BUFFER:
- case gfx::OZONE_NATIVE_BUFFER:
+ case gfx::OZONE_NATIVE_PIXMAP:
// GPU memory buffers that are shared with the GL using EGLImages
// require TEXTURE_EXTERNAL_OES.
return GL_TEXTURE_EXTERNAL_OES;
« no previous file with comments | « no previous file | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698