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

Unified Diff: main.cc

Issue 6793005: Add the xrender backend to the window manager. (Closed) Base URL: ssh://gitrw.chromium.org:9222/window_manager.git@master
Patch Set: Address fourth round of comments. Created 9 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 | « image_container.h ('k') | x11/mock_x_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: main.cc
diff --git a/main.cc b/main.cc
index e4eb077e38642f47ba1a524d7e1cb59ea98ab713..879d042b8b17783da4c1acc10adaaf1318e195eb 100644
--- a/main.cc
+++ b/main.cc
@@ -56,8 +56,10 @@ using window_manager::RealDBusInterface;
using window_manager::RealGLInterface;
#elif defined(COMPOSITOR_OPENGLES)
using window_manager::RealGles2Interface;
+#elif defined(COMPOSITOR_XRENDER)
#else
-#error COMPOSITOR_OPENGL or COMPOSITOR_OPENGLES must be defined
+#error COMPOSITOR_OPENGL, COMPOSITOR_OPENGLES or \
+COMPOSITOR_XRENDER must be defined
#endif
using window_manager::RealXConnection;
using window_manager::WindowManager;
@@ -147,10 +149,13 @@ int main(int argc, char** argv) {
EventLoop event_loop;
#if defined(COMPOSITOR_OPENGL)
RealGLInterface gl_interface(&xconn);
+ RealCompositor compositor(&event_loop, &xconn, &gl_interface);
#elif defined(COMPOSITOR_OPENGLES)
RealGles2Interface gl_interface(&xconn);
-#endif
RealCompositor compositor(&event_loop, &xconn, &gl_interface);
+#elif defined(COMPOSITOR_XRENDER)
+ RealCompositor compositor(&event_loop, &xconn);
+#endif
RealDBusInterface dbus;
dbus.Init();
« no previous file with comments | « image_container.h ('k') | x11/mock_x_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698