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

Unified Diff: components/exo/display.h

Issue 2443823002: exo: Fix CreateLinuxFence test. (Closed)
Patch Set: exo: Fix CreateLinuxFence test. Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/exo/DEPS ('k') | components/exo/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/display.h
diff --git a/components/exo/display.h b/components/exo/display.h
index bb778db32057ad0393d28d847de59aa10b2675f7..aca32c2dd42b7dbaa10bcb24cc2cb114a9cc7ddb 100644
--- a/components/exo/display.h
+++ b/components/exo/display.h
@@ -13,8 +13,11 @@
#include "base/macros.h"
#include "base/memory/shared_memory_handle.h"
-#if defined(USE_OZONE)
+#if defined(OS_LINUX)
#include "base/files/scoped_file.h"
+#endif
+
+#if defined(USE_OZONE)
#include "ui/gfx/buffer_types.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/native_pixmap_handle.h"
@@ -62,10 +65,12 @@ class Display {
gfx::BufferFormat format,
const std::vector<gfx::NativePixmapPlane>& planes,
std::vector<base::ScopedFD>&& fds);
+#endif // defined(USE_OZONE)
+#if defined(OS_LINUX)
// Creates a GpuFence for a Linux fence file descriptor.
std::unique_ptr<gfx::GpuFence> CreateLinuxFence(base::ScopedFD fd);
-#endif
+#endif // defined(OS_LINUX)
// Creates a shell surface for an existing surface.
std::unique_ptr<ShellSurface> CreateShellSurface(Surface* surface);
« no previous file with comments | « components/exo/DEPS ('k') | components/exo/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698