| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "cc/base/math_util.h" | 10 #include "cc/base/math_util.h" |
| 11 #include "cc/layers/heads_up_display_layer_impl.h" | 11 #include "cc/layers/heads_up_display_layer_impl.h" |
| 12 #include "cc/layers/layer.h" | 12 #include "cc/layers/layer.h" |
| 13 #include "cc/layers/layer_impl.h" | 13 #include "cc/layers/layer_impl.h" |
| 14 #include "cc/layers/layer_iterator.h" | 14 #include "cc/layers/layer_iterator.h" |
| 15 #include "cc/layers/render_surface.h" | 15 #include "cc/layers/render_surface.h" |
| 16 #include "cc/layers/render_surface_impl.h" | 16 #include "cc/layers/render_surface_impl.h" |
| 17 #include "cc/trees/layer_sorter.h" | 17 #include "cc/trees/layer_sorter.h" |
| 18 #include "cc/trees/layer_tree_impl.h" | 18 #include "cc/trees/layer_tree_impl.h" |
| 19 #include "ui/gfx/rect_conversions.h" | 19 #include "ui/gfx/rect_conversions.h" |
| 20 #include "ui/gfx/transform.h" | 20 #include "ui/gfx/transform.h" |
| 21 | 21 |
| 22 namespace cc { | 22 namespace cc { |
| 23 | 23 |
| 24 ScrollAndScaleSet::ScrollAndScaleSet() {} | 24 ScrollAndScaleSet::ScrollAndScaleSet() |
| 25 : page_scale_delta(1.f), top_controls_delta(0.f) { |
| 26 } |
| 25 | 27 |
| 26 ScrollAndScaleSet::~ScrollAndScaleSet() {} | 28 ScrollAndScaleSet::~ScrollAndScaleSet() {} |
| 27 | 29 |
| 28 static void SortLayers(LayerList::iterator forst, | 30 static void SortLayers(LayerList::iterator forst, |
| 29 LayerList::iterator end, | 31 LayerList::iterator end, |
| 30 void* layer_sorter) { | 32 void* layer_sorter) { |
| 31 NOTREACHED(); | 33 NOTREACHED(); |
| 32 } | 34 } |
| 33 | 35 |
| 34 static void SortLayers(LayerImplList::iterator first, | 36 static void SortLayers(LayerImplList::iterator first, |
| (...skipping 2402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2437 inputs->current_render_surface_layer_list_id); | 2439 inputs->current_render_surface_layer_list_id); |
| 2438 | 2440 |
| 2439 // The dummy layer list should not have been used. | 2441 // The dummy layer list should not have been used. |
| 2440 DCHECK_EQ(0u, dummy_layer_list.size()); | 2442 DCHECK_EQ(0u, dummy_layer_list.size()); |
| 2441 // A root layer render_surface should always exist after | 2443 // A root layer render_surface should always exist after |
| 2442 // CalculateDrawProperties. | 2444 // CalculateDrawProperties. |
| 2443 DCHECK(inputs->root_layer->render_surface()); | 2445 DCHECK(inputs->root_layer->render_surface()); |
| 2444 } | 2446 } |
| 2445 | 2447 |
| 2446 } // namespace cc | 2448 } // namespace cc |
| OLD | NEW |