Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "base/numerics/safe_math.h" | |
| 8 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 9 #include "cc/resources/resource_provider.h" | 10 #include "cc/resources/resource_provider.h" |
| 10 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
| 11 | 12 |
| 12 namespace cc { | 13 namespace cc { |
| 13 | 14 |
| 14 class CC_EXPORT Resource { | 15 class CC_EXPORT Resource { |
| 15 public: | 16 public: |
| 16 Resource() : id_(0) {} | 17 Resource() : id_(0) {} |
| 17 Resource(unsigned id, const gfx::Size& size, ResourceFormat format) | 18 Resource(unsigned id, const gfx::Size& size, ResourceFormat format) |
| 18 : id_(id), | 19 : id_(id), |
| 19 size_(size), | 20 size_(size), |
| 20 format_(format) {} | 21 format_(format) {} |
| 21 | 22 |
| 22 ResourceId id() const { return id_; } | 23 ResourceId id() const { return id_; } |
| 23 gfx::Size size() const { return size_; } | 24 gfx::Size size() const { return size_; } |
| 24 ResourceFormat format() const { return format_; } | 25 ResourceFormat format() const { return format_; } |
| 25 size_t bytes() const; | 26 size_t bytes() const; |
| 26 | 27 |
| 27 inline static size_t MemorySizeBytes(const gfx::Size& size, | 28 inline static size_t MemorySizeBytes(const gfx::Size& size, |
| 28 ResourceFormat format) { | 29 ResourceFormat format) { |
| 29 DCHECK_EQ(0, (BitsPerPixel(format) * size.width() * size.height()) % 8); | 30 DCHECK_EQ(0, (BitsPerPixel(format) * size.width() * size.height()) % 8); |
| 30 // TODO(vmpstr): Make this function overflow safe. crbug.com/495867 | 31 base::CheckedNumeric<size_t> result = BitsPerPixel(format); |
| 31 return static_cast<size_t>( | 32 result *= size.width(); |
| 32 (BitsPerPixel(format) * size.width() * size.height()) / 8); | 33 result *= size.height(); |
| 34 result /= 8; | |
| 35 return result.ValueOrDie(); | |
|
danakj
2015/06/04 19:02:38
This would work, but looking at the callsites of M
| |
| 33 } | 36 } |
| 34 | 37 |
| 35 protected: | 38 protected: |
| 36 void set_id(ResourceId id) { id_ = id; } | 39 void set_id(ResourceId id) { id_ = id; } |
| 37 void set_dimensions(const gfx::Size& size, ResourceFormat format) { | 40 void set_dimensions(const gfx::Size& size, ResourceFormat format) { |
| 38 size_ = size; | 41 size_ = size; |
| 39 format_ = format; | 42 format_ = format; |
| 40 } | 43 } |
| 41 | 44 |
| 42 private: | 45 private: |
| 43 ResourceId id_; | 46 ResourceId id_; |
| 44 gfx::Size size_; | 47 gfx::Size size_; |
| 45 ResourceFormat format_; | 48 ResourceFormat format_; |
| 46 | 49 |
| 47 DISALLOW_COPY_AND_ASSIGN(Resource); | 50 DISALLOW_COPY_AND_ASSIGN(Resource); |
| 48 }; | 51 }; |
| 49 | 52 |
| 50 } // namespace cc | 53 } // namespace cc |
| 51 | 54 |
| 52 #endif // CC_RESOURCES_RESOURCE_H_ | 55 #endif // CC_RESOURCES_RESOURCE_H_ |
| OLD | NEW |