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

Unified Diff: compositor/texture_data.h

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.cc ('k') | compositor/xrender/xrender_visitor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compositor/texture_data.h
diff --git a/compositor/texture_data.h b/compositor/texture_data.h
index 56f50b8c49c141942363b275471ace96ec689bcb..824ef291b0e41b5056bd9564e0288f994f97596d 100644
--- a/compositor/texture_data.h
+++ b/compositor/texture_data.h
@@ -5,12 +5,14 @@
#ifndef WINDOW_MANAGER_COMPOSITOR_TEXTURE_DATA_H_
#define WINDOW_MANAGER_COMPOSITOR_TEXTURE_DATA_H_
+#include <stdint.h>
+
namespace window_manager {
class TextureData {
public:
virtual ~TextureData() {}
- GLuint texture() const { return texture_; }
+ uint32_t texture() const { return texture_; }
bool has_alpha() const { return has_alpha_; }
void set_has_alpha(bool has_alpha) { has_alpha_ = has_alpha; }
@@ -19,11 +21,11 @@ class TextureData {
protected:
// TextureData is not allowed to be instantiated.
TextureData() : texture_(0), has_alpha_(true) {}
- void set_texture(GLuint texture) { texture_ = texture; }
- const GLuint* texture_ptr() { return &texture_; }
+ void set_texture(uint32_t texture) { texture_ = texture; }
+ const uint32_t* texture_ptr() { return &texture_; }
private:
- GLuint texture_;
+ uint32_t texture_;
bool has_alpha_;
DISALLOW_COPY_AND_ASSIGN(TextureData);
};
« no previous file with comments | « compositor/real_compositor.cc ('k') | compositor/xrender/xrender_visitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698