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

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

Issue 660333004: cc cleanup: Update paths to geometry headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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 unified diff | Download patch
« no previous file with comments | « cc/resources/priority_calculator.cc ('k') | cc/resources/resource_provider.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/geometry/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, const gfx::Size& size, ResourceFormat format)
19 : id_(id), 19 : id_(id),
20 size_(size), 20 size_(size),
21 format_(format) {} 21 format_(format) {}
(...skipping 20 matching lines...) Expand all
42 ResourceProvider::ResourceId id_; 42 ResourceProvider::ResourceId id_;
43 gfx::Size size_; 43 gfx::Size size_;
44 ResourceFormat format_; 44 ResourceFormat format_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(Resource); 46 DISALLOW_COPY_AND_ASSIGN(Resource);
47 }; 47 };
48 48
49 } // namespace cc 49 } // namespace cc
50 50
51 #endif // CC_RESOURCES_RESOURCE_H_ 51 #endif // CC_RESOURCES_RESOURCE_H_
OLDNEW
« no previous file with comments | « cc/resources/priority_calculator.cc ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698