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

Unified Diff: ui/gl/gl_image_memory.h

Issue 1061733002: Remove windows/mac/ios specific code from //ui (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix default try set Created 5 years, 9 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 | « ui/gl/gl_image_io_surface.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_memory.h
diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
index a50a38064b1574ad55f571bb76581e9922d9399f..022782268184ce69b5e3818d85c29cbbe115493f 100644
--- a/ui/gl/gl_image_memory.h
+++ b/ui/gl/gl_image_memory.h
@@ -7,11 +7,8 @@
#include "ui/gl/gl_image.h"
-#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
- defined(USE_OZONE)
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#endif
#include "base/numerics/safe_math.h"
#include "ui/gfx/gpu_memory_buffer.h"
@@ -58,11 +55,8 @@ class GL_EXPORT GLImageMemory : public GLImage {
bool in_use_;
unsigned target_;
bool need_do_bind_tex_image_;
-#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
- defined(USE_OZONE)
unsigned egl_texture_id_;
EGLImageKHR egl_image_;
-#endif
DISALLOW_COPY_AND_ASSIGN(GLImageMemory);
};
« no previous file with comments | « ui/gl/gl_image_io_surface.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698