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

Side by Side Diff: cc/resource.h

Issue 11412022: Switched cc::Resource and cc::ScopedResource to Chrome coding style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit tests. Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/prioritized_resource_unittest.cc ('k') | cc/resource.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_RESOURCE_H_ 5 #ifndef CC_RESOURCE_H_
6 #define CC_RESOURCE_H_ 6 #define CC_RESOURCE_H_
7 7
8 #include "cc/cc_export.h" 8 #include "cc/cc_export.h"
9 #include "cc/resource_provider.h" 9 #include "cc/resource_provider.h"
10 #include "third_party/khronos/GLES2/gl2.h" 10 #include "third_party/khronos/GLES2/gl2.h"
11 #include "ui/gfx/size.h" 11 #include "ui/gfx/size.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 class CC_EXPORT Resource { 15 class CC_EXPORT Resource {
16 public: 16 public:
17 Resource() : m_id(0) { } 17 Resource() : id_(0) { }
18 Resource(unsigned id, gfx::Size size, GLenum format) 18 Resource(unsigned id, gfx::Size size, GLenum format)
19 : m_id(id) 19 : id_(id), size_(size), format_(format) { }
20 , m_size(size)
21 , m_format(format) { }
22 20
23 ResourceProvider::ResourceId id() const { return m_id; } 21 ResourceProvider::ResourceId id() const { return id_; }
24 const gfx::Size& size() const { return m_size; } 22 const gfx::Size& size() const { return size_; }
25 GLenum format() const { return m_format; } 23 GLenum format() const { return format_; }
26 24
27 void setId(ResourceProvider::ResourceId id) { m_id = id; } 25 size_t bytes() const;
28 void setDimensions(const gfx::Size&, GLenum format);
29 26
30 size_t bytes() const; 27 static size_t BytesPerPixel(GLenum format);
28 static size_t MemorySizeBytes(const gfx::Size& size, GLenum format);
31 29
32 static size_t bytesPerPixel(GLenum format); 30 protected:
33 static size_t memorySizeBytes(const gfx::Size&, GLenum format); 31 void set_id(ResourceProvider::ResourceId id) { id_ = id; }
32 void set_dimensions(const gfx::Size&, GLenum format);
34 33
35 private: 34 private:
36 ResourceProvider::ResourceId m_id; 35 ResourceProvider::ResourceId id_;
37 gfx::Size m_size; 36 gfx::Size size_;
38 GLenum m_format; 37 GLenum format_;
39 }; 38 };
40 39
41 } 40 } // namespace cc
42 41
43 #endif // CC_RESOURCE_H_ 42 #endif // CC_RESOURCE_H_
OLDNEW
« no previous file with comments | « cc/prioritized_resource_unittest.cc ('k') | cc/resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698