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

Side by Side Diff: cc/tiles/tile_draw_info.h

Issue 1144523003: Rename cc::ResourceProvider::ResourceId to cc::ResourceId and move it to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/test/render_pass_test_utils.cc ('k') | cc/trees/layer_tree_host_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TILES_TILE_DRAW_INFO_H_ 5 #ifndef CC_TILES_TILE_DRAW_INFO_H_
6 #define CC_TILES_TILE_DRAW_INFO_H_ 6 #define CC_TILES_TILE_DRAW_INFO_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/trace_event/trace_event_argument.h" 9 #include "base/trace_event/trace_event_argument.h"
10 #include "cc/raster/tile_task_runner.h" 10 #include "cc/raster/tile_task_runner.h"
(...skipping 30 matching lines...) Expand all
41 return !resource_; 41 return !resource_;
42 case SOLID_COLOR_MODE: 42 case SOLID_COLOR_MODE:
43 return false; 43 return false;
44 case OOM_MODE: 44 case OOM_MODE:
45 return true; 45 return true;
46 } 46 }
47 NOTREACHED(); 47 NOTREACHED();
48 return false; 48 return false;
49 } 49 }
50 50
51 ResourceProvider::ResourceId resource_id() const { 51 ResourceId resource_id() const {
52 DCHECK(mode_ == RESOURCE_MODE); 52 DCHECK(mode_ == RESOURCE_MODE);
53 DCHECK(resource_); 53 DCHECK(resource_);
54 return resource_->id(); 54 return resource_->id();
55 } 55 }
56 56
57 gfx::Size resource_size() const { 57 gfx::Size resource_size() const {
58 DCHECK(mode_ == RESOURCE_MODE); 58 DCHECK(mode_ == RESOURCE_MODE);
59 DCHECK(resource_); 59 DCHECK(resource_);
60 return resource_->size(); 60 return resource_->size();
61 } 61 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void set_oom() { mode_ = OOM_MODE; } 97 void set_oom() { mode_ = OOM_MODE; }
98 98
99 Mode mode_; 99 Mode mode_;
100 SkColor solid_color_; 100 SkColor solid_color_;
101 scoped_ptr<ScopedResource> resource_; 101 scoped_ptr<ScopedResource> resource_;
102 }; 102 };
103 103
104 } // namespace cc 104 } // namespace cc
105 105
106 #endif // CC_TILES_TILE_DRAW_INFO_H_ 106 #endif // CC_TILES_TILE_DRAW_INFO_H_
OLDNEW
« no previous file with comments | « cc/test/render_pass_test_utils.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698