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

Unified Diff: gpu/command_buffer/service/texture_definition.h

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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: gpu/command_buffer/service/texture_definition.h
diff --git a/gpu/command_buffer/service/texture_definition.h b/gpu/command_buffer/service/texture_definition.h
index cb21abda208561e86cec66e5e9d8e912da0947d7..ff891fc4ff310997f2db32e7f7e9497c7085bdd0 100644
--- a/gpu/command_buffer/service/texture_definition.h
+++ b/gpu/command_buffer/service/texture_definition.h
@@ -40,8 +40,8 @@ class NativeImageBuffer : public base::RefCountedThreadSafe<NativeImageBuffer> {
// the underlying image buffer(s).
class TextureDefinition {
public:
- TextureDefinition(GLenum target,
- Texture* texture,
+ TextureDefinition();
+ TextureDefinition(Texture* texture,
unsigned int version,
const scoped_refptr<NativeImageBuffer>& image);
virtual ~TextureDefinition();
@@ -55,7 +55,7 @@ class TextureDefinition {
}
bool Matches(const Texture* texture) const;
- scoped_refptr<NativeImageBuffer> image() { return image_buffer_; }
+ scoped_refptr<NativeImageBuffer> image() const { return image_buffer_; }
private:
struct LevelInfo {
« no previous file with comments | « gpu/command_buffer/service/mailbox_synchronizer.cc ('k') | gpu/command_buffer/service/texture_definition.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698