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 #include "cc/resources/tile.h" | 5 #include "cc/resources/tile.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
10 #include "cc/debug/traced_value.h" | 10 #include "cc/debug/traced_value.h" |
(...skipping 27 matching lines...) Expand all Loading... | |
38 } | 38 } |
39 | 39 |
40 Tile::~Tile() { | 40 Tile::~Tile() { |
41 TRACE_EVENT_OBJECT_DELETED_WITH_ID( | 41 TRACE_EVENT_OBJECT_DELETED_WITH_ID( |
42 TRACE_DISABLED_BY_DEFAULT("cc.debug"), | 42 TRACE_DISABLED_BY_DEFAULT("cc.debug"), |
43 "cc::Tile", this); | 43 "cc::Tile", this); |
44 } | 44 } |
45 | 45 |
46 void Tile::SetPriority(WhichTree tree, const TilePriority& priority) { | 46 void Tile::SetPriority(WhichTree tree, const TilePriority& priority) { |
47 if (priority == priority_[tree]) | 47 if (priority == priority_[tree]) |
48 return; | 48 return; |
reveman
2014/06/14 14:53:24
I don't think this early out makes sense anymore.
vmpstr
2014/06/16 18:18:19
Done.
| |
49 | 49 |
50 priority_[tree] = priority; | 50 priority_[tree] = priority; |
51 tile_manager_->DidChangeTilePriority(this); | |
52 } | 51 } |
53 | 52 |
54 void Tile::MarkRequiredForActivation() { | 53 void Tile::MarkRequiredForActivation() { |
55 if (priority_[PENDING_TREE].required_for_activation) | 54 if (priority_[PENDING_TREE].required_for_activation) |
56 return; | 55 return; |
reveman
2014/06/14 14:53:24
neither does this one
vmpstr
2014/06/16 18:18:19
Done.
| |
57 | 56 |
58 priority_[PENDING_TREE].required_for_activation = true; | 57 priority_[PENDING_TREE].required_for_activation = true; |
59 tile_manager_->DidChangeTilePriority(this); | |
60 } | 58 } |
61 | 59 |
62 scoped_ptr<base::Value> Tile::AsValue() const { | 60 scoped_ptr<base::Value> Tile::AsValue() const { |
63 scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue()); | 61 scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue()); |
64 TracedValue::MakeDictIntoImplicitSnapshotWithCategory( | 62 TracedValue::MakeDictIntoImplicitSnapshotWithCategory( |
65 TRACE_DISABLED_BY_DEFAULT("cc.debug"), res.get(), "cc::Tile", this); | 63 TRACE_DISABLED_BY_DEFAULT("cc.debug"), res.get(), "cc::Tile", this); |
66 res->Set("picture_pile", | 64 res->Set("picture_pile", |
67 TracedValue::CreateIDRef(picture_pile_.get()).release()); | 65 TracedValue::CreateIDRef(picture_pile_.get()).release()); |
68 res->SetDouble("contents_scale", contents_scale_); | 66 res->SetDouble("contents_scale", contents_scale_); |
69 res->Set("content_rect", MathUtil::AsValue(content_rect_).release()); | 67 res->Set("content_rect", MathUtil::AsValue(content_rect_).release()); |
(...skipping 23 matching lines...) Expand all Loading... | |
93 RasterMode Tile::DetermineRasterModeForResolution( | 91 RasterMode Tile::DetermineRasterModeForResolution( |
94 TileResolution resolution) const { | 92 TileResolution resolution) const { |
95 RasterMode current_mode = managed_state_.raster_mode; | 93 RasterMode current_mode = managed_state_.raster_mode; |
96 RasterMode raster_mode = resolution == LOW_RESOLUTION | 94 RasterMode raster_mode = resolution == LOW_RESOLUTION |
97 ? LOW_QUALITY_RASTER_MODE | 95 ? LOW_QUALITY_RASTER_MODE |
98 : HIGH_QUALITY_RASTER_MODE; | 96 : HIGH_QUALITY_RASTER_MODE; |
99 return std::min(raster_mode, current_mode); | 97 return std::min(raster_mode, current_mode); |
100 } | 98 } |
101 | 99 |
102 } // namespace cc | 100 } // namespace cc |
OLD | NEW |