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/tile.h" | 5 #include "cc/tile.h" |
6 | 6 |
7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "cc/tile_drawing_info.h" |
8 #include "cc/tile_manager.h" | 9 #include "cc/tile_manager.h" |
9 #include "third_party/khronos/GLES2/gl2.h" | 10 #include "third_party/khronos/GLES2/gl2.h" |
10 | 11 |
11 namespace cc { | 12 namespace cc { |
12 | 13 |
13 Tile::Tile(TileManager* tile_manager, | 14 Tile::Tile(TileManager* tile_manager, |
14 PicturePileImpl* picture_pile, | 15 PicturePileImpl* picture_pile, |
15 gfx::Size tile_size, | 16 gfx::Size tile_size, |
16 GLenum format, | 17 GLenum format, |
17 gfx::Rect content_rect, | 18 gfx::Rect content_rect, |
(...skipping 21 matching lines...) Expand all Loading... |
39 res->SetString("picture_pile", base::StringPrintf("%p", | 40 res->SetString("picture_pile", base::StringPrintf("%p", |
40 picture_pile_.get())); | 41 picture_pile_.get())); |
41 res->SetDouble("contents_scale", contents_scale_); | 42 res->SetDouble("contents_scale", contents_scale_); |
42 res->Set("priority.0", priority_[ACTIVE_TREE].AsValue().release()); | 43 res->Set("priority.0", priority_[ACTIVE_TREE].AsValue().release()); |
43 res->Set("priority.1", priority_[PENDING_TREE].AsValue().release()); | 44 res->Set("priority.1", priority_[PENDING_TREE].AsValue().release()); |
44 res->Set("managed_state", managed_state_.AsValue().release()); | 45 res->Set("managed_state", managed_state_.AsValue().release()); |
45 return res.PassAs<base::Value>(); | 46 return res.PassAs<base::Value>(); |
46 } | 47 } |
47 | 48 |
48 } // namespace cc | 49 } // namespace cc |
OLD | NEW |