Add the xrender backend to the window manager.

compositor/real_compositor.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WINDOW_MANAGER_COMPOSITOR_REAL_COMPOSITOR_H_
 #define WINDOW_MANAGER_COMPOSITOR_REAL_COMPOSITOR_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <tr1/memory>
 #include <tr1/unordered_set>
 #include <vector>
 
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST() macro
 
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "window_manager/compositor/animation.h"
 #include "window_manager/compositor/compositor.h"
 #include "window_manager/math_types.h"
 #include "window_manager/x11/x_types.h"
 
-#if !(defined(COMPOSITOR_OPENGL) || defined(COMPOSITOR_OPENGLES))
-#error COMPOSITOR_OPENGL or COMPOSITOR_OPENGLES must be defined
+#if !(defined(COMPOSITOR_OPENGL) || defined(COMPOSITOR_OPENGLES)\
+                || defined(COMPOSITOR_XRENDER))

[Daniel Erat, 2011/04/02 14:54:36]

improve indenting?

#if !(defined(...) || \
      defined(...) || \
      defined(...))
#error
#endif

[marcheu, 2011/04/04 19:55:58]

Done.

+#error COMPOSITOR_OPENGL, COMPOSITOR_OPENGLES or\
+ COMPOSITOR_XRENDER must be defined
 #endif
 
 namespace window_manager {
 
 class EventLoop;
 class Gles2Interface;
 class GLInterface;
 class OpenGlDrawVisitor;
 class OpenGlesDrawVisitor;
 class TextureData;
 class XConnection;
+class XRenderDrawVisitor;
 
 class RealCompositor : public Compositor {
  public:
   class Actor;
   class ColoredBoxActor;
   class ContainerActor;
   class ImageActor;
   class QuadActor;
   class StageActor;
   class TexturePixmapActor;
@@ skipping 534 matching lines @@
 
     // Has the stage been resized?  This gets set by SetSizeImpl() and
     // then checked and reset by the visitor after it resizes the viewport.
     bool was_resized_;
 
     Compositor::Color stage_color_;
     DISALLOW_COPY_AND_ASSIGN(StageActor);
   };
 
   RealCompositor(EventLoop* event_loop,
-                 XConnection* x_conn,
+                 XConnection* x_conn
 #if defined(COMPOSITOR_OPENGL)
-                 GLInterface* gl_interface
+                 ,GLInterface* gl_interface
 #elif defined(COMPOSITOR_OPENGLES)
-                 Gles2Interface* gl_interface
+                 ,Gles2Interface* gl_interface
 #endif
                 );
   ~RealCompositor();
 
   // Begin Compositor methods.
   virtual void RegisterCompositionChangeListener(
       CompositionChangeListener* listener);
   virtual void UnregisterCompositionChangeListener(
       CompositionChangeListener* listener);
   virtual bool TexturePixmapActorUsesFastPath() {
@@ skipping 15 matching lines @@
   virtual void Draw();
   // End Compositor methods
 
   XConnection* x_conn() { return x_conn_; }
   // TODO: These are just here so that ImageActor::SetImageData() can
   // update its texture.  Find a better way to expose this.
 #if defined(COMPOSITOR_OPENGL)
   OpenGlDrawVisitor* draw_visitor() { return draw_visitor_.get(); }
 #elif defined(COMPOSITOR_OPENGLES)
   OpenGlesDrawVisitor* draw_visitor() { return draw_visitor_.get(); }
+#elif defined(COMPOSITOR_XRENDER)
+  XRenderDrawVisitor* draw_visitor() { return draw_visitor_.get(); }
 #endif
   int actor_count() { return actor_count_; }
   bool dirty() const { return dirty_; }
   bool using_visibility_groups() const {
     return !active_visibility_groups_.empty();
   }
   const std::tr1::unordered_set<int>& active_visibility_groups() const {
     return active_visibility_groups_;
   }
 
@@ skipping 52 matching lines @@
 
   // This is the count of actors in the tree as of the last time
   // Update was called.  It is used to compute the depth delta for
   // layer depth calculations.
   int32 actor_count_;
 
 #if defined(COMPOSITOR_OPENGL)
   scoped_ptr<OpenGlDrawVisitor> draw_visitor_;
 #elif defined(COMPOSITOR_OPENGLES)
   scoped_ptr<OpenGlesDrawVisitor> draw_visitor_;
+#elif defined(COMPOSITOR_XRENDER)
+  scoped_ptr<XRenderDrawVisitor> draw_visitor_;
 #endif
 
   // Time that we last drew the scene.
   base::TimeTicks last_draw_time_;
 
   // ID of the event loop timeout used to invoke Draw().
   int draw_timeout_id_;
 
   // Is the drawing timeout currently enabled?
   bool draw_timeout_enabled_;
@@ skipping 15 matching lines @@
   // actors changes.  Listener objects aren't owned by us.
   std::tr1::unordered_set<CompositionChangeListener*>
       composition_change_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(RealCompositor);
 };
 
 }  // namespace window_manager
 
 #endif  // WINDOW_MANAGER_COMPOSITOR_REAL_COMPOSITOR_H_