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

Unified Diff: gpu/ipc/common/gpu_memory_buffer_support.cc

Issue 2709163004: Rename GpuMemoryBufferFactoryOzoneNativePixmap to GpuMemoryBufferFactoryNativePixmap (Closed)
Patch Set: Rebase Created 3 years, 8 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: gpu/ipc/common/gpu_memory_buffer_support.cc
diff --git a/gpu/ipc/common/gpu_memory_buffer_support.cc b/gpu/ipc/common/gpu_memory_buffer_support.cc
index 3dfc6041fad2a4e84efde86c9098ea213fa4bedf..89e39694d9939e24954c585010ae482e8cb0f69c 100644
--- a/gpu/ipc/common/gpu_memory_buffer_support.cc
+++ b/gpu/ipc/common/gpu_memory_buffer_support.cc
@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "build/build_config.h"
-#if defined(USE_OZONE)
-#include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
+#if defined(OS_LINUX)
+#include "ui/gfx/client_native_pixmap_factory.h"
#endif
namespace gpu {
@@ -17,7 +17,7 @@ gfx::GpuMemoryBufferType GetNativeGpuMemoryBufferType() {
#if defined(OS_MACOSX)
return gfx::IO_SURFACE_BUFFER;
#endif
-#if defined(USE_OZONE)
+#if defined(OS_LINUX)
return gfx::NATIVE_PIXMAP;
#endif
return gfx::EMPTY_BUFFER;
@@ -46,7 +46,7 @@ bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
return false;
#endif
-#if defined(USE_OZONE)
+#if defined(OS_LINUX)
if (!gfx::ClientNativePixmapFactory::GetInstance()) {
// unittests don't have to set ClientNativePixmapFactory.
return false;

Powered by Google App Engine
This is Rietveld 408576698