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

Unified Diff: compositor/real_compositor.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 | « compositor/real_compositor.h ('k') | compositor/texture_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compositor/real_compositor.cc
diff --git a/compositor/real_compositor.cc b/compositor/real_compositor.cc
index a7bdf79c6b8dfc1b81e1ec92e636ba15b88f66bc..ca6d341108b320d43f8dfb2e77325bee2eb0184b 100644
--- a/compositor/real_compositor.cc
+++ b/compositor/real_compositor.cc
@@ -17,6 +17,8 @@
#include "window_manager/compositor/gl/opengl_visitor.h"
#elif defined(COMPOSITOR_OPENGLES)
#include "window_manager/compositor/gles/opengles_visitor.h"
+#elif defined(COMPOSITOR_XRENDER)
+#include "window_manager/compositor/xrender/xrender_visitor.h"
#endif
#include "window_manager/compositor/layer_visitor.h"
#include "window_manager/event_loop.h"
@@ -606,7 +608,7 @@ RealCompositor::Actor* RealCompositor::ImageActor::Clone() {
void RealCompositor::ImageActor::SetImageData(
const ImageContainer& image_container) {
- compositor()->draw_visitor()->BindImage(&image_container, this);
+ compositor()->draw_visitor()->BindImage(image_container, this);
SetSizeInternal(image_container.width(), image_container.height());
SetDirty();
}
@@ -704,11 +706,11 @@ bool RealCompositor::StageActor::using_passthrough_projection() const {
RealCompositor::RealCompositor(EventLoop* event_loop,
- XConnection* xconn,
+ XConnection* xconn
#if defined(COMPOSITOR_OPENGL)
- GLInterface* gl_interface
+ ,GLInterface* gl_interface
#elif defined(COMPOSITOR_OPENGLES)
- Gles2Interface* gl_interface
+ ,Gles2Interface* gl_interface
#endif
)
: event_loop_(event_loop),
@@ -743,6 +745,8 @@ RealCompositor::RealCompositor(EventLoop* event_loop,
new OpenGlDrawVisitor(gl_interface, this, default_stage_.get())
#elif defined(COMPOSITOR_OPENGLES)
new OpenGlesDrawVisitor(gl_interface, this, default_stage_.get())
+#elif defined(COMPOSITOR_XRENDER)
+ new XRenderDrawVisitor(this, default_stage_.get())
#endif
);
« no previous file with comments | « compositor/real_compositor.h ('k') | compositor/texture_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698