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

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

Issue 2709163004: Rename GpuMemoryBufferFactoryOzoneNativePixmap to GpuMemoryBufferFactoryNativePixmap (Closed)
Patch Set: Rebase and addressed reveman's remark. 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
« no previous file with comments | « gpu/ipc/client/gpu_memory_buffer_impl_native_pixmap.cc ('k') | gpu/ipc/service/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 73ac6b658f5f0127fd6c798f42eae15c5cca4fc9..77f98359d26a34b845720227545aeb54bdcaf1bf 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;
@@ -47,7 +47,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;
« no previous file with comments | « gpu/ipc/client/gpu_memory_buffer_impl_native_pixmap.cc ('k') | gpu/ipc/service/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698