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

Unified Diff: content/browser/renderer_host/image_transport_client_linux.cc

Issue 10009024: Remove WAYLAND port (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 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 | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | skia/ext/canvas_paint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/image_transport_client_linux.cc
diff --git a/content/browser/renderer_host/image_transport_client_linux.cc b/content/browser/renderer_host/image_transport_client_linux.cc
index 1153c6a5c48910cedbe52f6b75549575ceaeb88d..779e1eb752b0dd1bfa5546b74e25119364abc540 100644
--- a/content/browser/renderer_host/image_transport_client_linux.cc
+++ b/content/browser/renderer_host/image_transport_client_linux.cc
@@ -83,8 +83,6 @@ class ImageTransportClientEGL : public ImageTransportClient {
EGLImageKHR image_;
};
-#if !defined(USE_WAYLAND)
-
class ImageTransportClientGLX : public ImageTransportClient {
public:
ImageTransportClientGLX(ImageTransportFactory* factory, const gfx::Size& size)
@@ -289,20 +287,16 @@ class ImageTransportClientOSMesa : public ImageTransportClient {
};
uint32 ImageTransportClientOSMesa::next_handle_ = 0;
-#endif // !USE_WAYLAND
-
} // anonymous namespace
ImageTransportClient* ImageTransportClient::Create(
ImageTransportFactory* factory,
const gfx::Size& size) {
switch (gfx::GetGLImplementation()) {
-#if !defined(USE_WAYLAND)
case gfx::kGLImplementationOSMesaGL:
return new ImageTransportClientOSMesa(factory, size);
case gfx::kGLImplementationDesktopGL:
return new ImageTransportClientGLX(factory, size);
-#endif
case gfx::kGLImplementationEGLGLES2:
return new ImageTransportClientEGL(factory, size);
default:
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_view.cc ('k') | skia/ext/canvas_paint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698