Commit 860b3e2a authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

Refactor OS_LINUX preprocessor directive for LaCrOS effort.

Currently, ChromeOS defines the OS_LINUX directive as well as
OS_CHROMEOS.  We're working to separate these two, so we're
making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS
explicit.

This is changes for /gpu/ipc/common/gpu_memory_buffer_support.h

This CL was uploaded by git cl split.

R=dcastagna@chromium.org

Bug: 1110266
Change-Id: I5b10a6b731b816cbeacbb7a11916c93f33f40ae5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2370728Reviewed-by: default avatarDaniele Castagna <dcastagna@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Sean McAllister <smcallis@google.com>
Cr-Commit-Position: refs/heads/master@{#801632}
parent 5c2e03af
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/gpu_memory_buffer.h"
#if defined(OS_LINUX) || defined(USE_OZONE) #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE)
namespace gfx { namespace gfx {
class ClientNativePixmapFactory; class ClientNativePixmapFactory;
} }
...@@ -38,7 +38,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { ...@@ -38,7 +38,7 @@ class GPU_EXPORT GpuMemoryBufferSupport {
bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format, bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
gfx::BufferUsage usage); gfx::BufferUsage usage);
#if defined(OS_LINUX) || defined(USE_OZONE) #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE)
gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { gfx::ClientNativePixmapFactory* client_native_pixmap_factory() {
return client_native_pixmap_factory_.get(); return client_native_pixmap_factory_.get();
} }
...@@ -62,7 +62,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { ...@@ -62,7 +62,7 @@ class GPU_EXPORT GpuMemoryBufferSupport {
GpuMemoryBufferImpl::DestructionCallback callback); GpuMemoryBufferImpl::DestructionCallback callback);
private: private:
#if defined(OS_LINUX) || defined(USE_OZONE) #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE)
std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_; std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment