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

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: 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
Index: compositor/texture_data.h
diff --git a/compositor/texture_data.h b/compositor/texture_data.h
index 56f50b8c49c141942363b275471ace96ec689bcb..38216ead76f0afba1dabffb09d7ed9cd851cf28f 100644
--- a/compositor/texture_data.h
+++ b/compositor/texture_data.h
@@ -10,7 +10,7 @@ namespace window_manager {
class TextureData {
public:
virtual ~TextureData() {}
- GLuint texture() const { return texture_; }
+ unsigned texture() const { return texture_; }
Daniel Erat 2011/04/02 14:54:36 "unsigned" makes me nervous. please use uint32_t
marcheu 2011/04/04 19:55:58 GLuint is actually defined as an unsigned, but I s
bool has_alpha() const { return has_alpha_; }
void set_has_alpha(bool has_alpha) { has_alpha_ = has_alpha; }
@@ -19,11 +19,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(unsigned texture) { texture_ = texture; }
+ const unsigned* texture_ptr() { return &texture_; }
private:
- GLuint texture_;
+ unsigned texture_;
bool has_alpha_;
DISALLOW_COPY_AND_ASSIGN(TextureData);
};

Powered by Google App Engine
This is Rietveld 408576698