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

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

Issue 8598018: wayland: modify image_transport_client to compile with use_wayland (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/image_transport_client.cc
diff --git a/content/browser/renderer_host/image_transport_client.cc b/content/browser/renderer_host/image_transport_client.cc
index 7ced869b77a5f1a9e7a2c8614ec1281a9479bcfa..8f02bc18129b294cf6c3b30a813119ba62ea222d 100644
--- a/content/browser/renderer_host/image_transport_client.cc
+++ b/content/browser/renderer_host/image_transport_client.cc
@@ -81,6 +81,8 @@ class ImageTransportClientEGL : public ImageTransportClient {
EGLImageKHR image_;
};
+#if !defined(USE_WAYLAND)
+
class ImageTransportClientGLX : public ImageTransportClient {
public:
explicit ImageTransportClientGLX(ui::SharedResources* resources)
@@ -272,18 +274,22 @@ class ImageTransportClientOSMesa : public ImageTransportClient {
};
uint32 ImageTransportClientOSMesa::next_id_ = 0;
+#endif // !USE_WAYLAND
+
} // anonymous namespace
ImageTransportClient* ImageTransportClient::Create(
ui::SharedResources* resources,
const gfx::Size& size) {
switch (gfx::GetGLImplementation()) {
+#if !defined(USE_WAYLAND)
+ case gfx::kGLImplementationOSMesaGL:
+ return new ImageTransportClientOSMesa(resources, size);
case gfx::kGLImplementationDesktopGL:
return new ImageTransportClientGLX(resources);
+#endif
case gfx::kGLImplementationEGLGLES2:
return new ImageTransportClientEGL(resources);
- case gfx::kGLImplementationOSMesaGL:
- return new ImageTransportClientOSMesa(resources, size);
default:
NOTREACHED();
return NULL;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698