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

Side by Side Diff: cc/resources/resource.h

Issue 142863008: Revert of [#7] Pass gfx structs by const ref (gfx::Size) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 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 unified diff | Download patch
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/resources/resource_pool.h » ('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_RESOURCES_RESOURCE_H_ 5 #ifndef CC_RESOURCES_RESOURCE_H_
6 #define CC_RESOURCES_RESOURCE_H_ 6 #define CC_RESOURCES_RESOURCE_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "cc/resources/resource_provider.h" 9 #include "cc/resources/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() : id_(0) {} 17 Resource() : id_(0) {}
18 Resource(unsigned id, const gfx::Size& size, ResourceFormat format) 18 Resource(unsigned id, gfx::Size size, ResourceFormat format)
19 : id_(id), 19 : id_(id),
20 size_(size), 20 size_(size),
21 format_(format) {} 21 format_(format) {}
22 22
23 ResourceProvider::ResourceId id() const { return id_; } 23 ResourceProvider::ResourceId id() const { return id_; }
24 gfx::Size size() const { return size_; } 24 gfx::Size size() const { return size_; }
25 ResourceFormat format() const { return format_; } 25 ResourceFormat format() const { return format_; }
26 size_t bytes() const; 26 size_t bytes() const;
27 27
28 inline static size_t MemorySizeBytes(const gfx::Size& size, 28 inline static size_t MemorySizeBytes(gfx::Size size, ResourceFormat format) {
29 ResourceFormat format) {
30 DCHECK_EQ(0u, (BitsPerPixel(format) * size.width() * size.height()) % 8); 29 DCHECK_EQ(0u, (BitsPerPixel(format) * size.width() * size.height()) % 8);
31 return (BitsPerPixel(format) * size.width() * size.height()) / 8; 30 return (BitsPerPixel(format) * size.width() * size.height()) / 8;
32 } 31 }
33 32
34 protected: 33 protected:
35 void set_id(ResourceProvider::ResourceId id) { id_ = id; } 34 void set_id(ResourceProvider::ResourceId id) { id_ = id; }
36 void set_dimensions(const gfx::Size& size, ResourceFormat format) { 35 void set_dimensions(gfx::Size size, ResourceFormat format) {
37 size_ = size; 36 size_ = size;
38 format_ = format; 37 format_ = format;
39 } 38 }
40 39
41 private: 40 private:
42 ResourceProvider::ResourceId id_; 41 ResourceProvider::ResourceId id_;
43 gfx::Size size_; 42 gfx::Size size_;
44 ResourceFormat format_; 43 ResourceFormat format_;
45 44
46 DISALLOW_COPY_AND_ASSIGN(Resource); 45 DISALLOW_COPY_AND_ASSIGN(Resource);
47 }; 46 };
48 47
49 } // namespace cc 48 } // namespace cc
50 49
51 #endif // CC_RESOURCES_RESOURCE_H_ 50 #endif // CC_RESOURCES_RESOURCE_H_
OLDNEW
« no previous file with comments | « cc/resources/raster_worker_pool_unittest.cc ('k') | cc/resources/resource_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698