| 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 "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "cc/resources/tile_manager.h" | 8 #include "cc/resources/tile_manager.h" |
| 9 #include "third_party/khronos/GLES2/gl2.h" | 9 #include "third_party/khronos/GLES2/gl2.h" |
| 10 | 10 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 res->SetString("picture_pile", base::StringPrintf("%p", | 39 res->SetString("picture_pile", base::StringPrintf("%p", |
| 40 picture_pile_.get())); | 40 picture_pile_.get())); |
| 41 res->SetDouble("contents_scale", contents_scale_); | 41 res->SetDouble("contents_scale", contents_scale_); |
| 42 res->Set("priority.0", priority_[ACTIVE_TREE].AsValue().release()); | 42 res->Set("priority.0", priority_[ACTIVE_TREE].AsValue().release()); |
| 43 res->Set("priority.1", priority_[PENDING_TREE].AsValue().release()); | 43 res->Set("priority.1", priority_[PENDING_TREE].AsValue().release()); |
| 44 res->Set("managed_state", managed_state_.AsValue().release()); | 44 res->Set("managed_state", managed_state_.AsValue().release()); |
| 45 return res.PassAs<base::Value>(); | 45 return res.PassAs<base::Value>(); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void Tile::SetPriority(WhichTree tree, const TilePriority& priority) { | 48 void Tile::SetPriority(WhichTree tree, const TilePriority& priority) { |
| 49 if (priority_[tree] == priority) |
| 50 return; |
| 51 |
| 49 tile_manager_->WillModifyTilePriority(this, tree, priority); | 52 tile_manager_->WillModifyTilePriority(this, tree, priority); |
| 50 priority_[tree] = priority; | 53 priority_[tree] = priority; |
| 51 } | 54 } |
| 52 | 55 |
| 53 } // namespace cc | 56 } // namespace cc |
| OLD | NEW |