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

Side by Side Diff: cc/trees/layer_tree_impl.cc

Issue 660333004: cc cleanup: Update paths to geometry headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 2 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/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/layer_tree_impl_unittest.cc » ('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 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_impl.h" 5 #include "cc/trees/layer_tree_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <set> 8 #include <set>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/debug/trace_event_argument.h" 11 #include "base/debug/trace_event_argument.h"
12 #include "cc/animation/keyframed_animation_curve.h" 12 #include "cc/animation/keyframed_animation_curve.h"
13 #include "cc/animation/scrollbar_animation_controller.h" 13 #include "cc/animation/scrollbar_animation_controller.h"
14 #include "cc/animation/scrollbar_animation_controller_linear_fade.h" 14 #include "cc/animation/scrollbar_animation_controller_linear_fade.h"
15 #include "cc/animation/scrollbar_animation_controller_thinning.h" 15 #include "cc/animation/scrollbar_animation_controller_thinning.h"
16 #include "cc/base/math_util.h" 16 #include "cc/base/math_util.h"
17 #include "cc/base/util.h" 17 #include "cc/base/util.h"
18 #include "cc/debug/devtools_instrumentation.h" 18 #include "cc/debug/devtools_instrumentation.h"
19 #include "cc/debug/traced_value.h" 19 #include "cc/debug/traced_value.h"
20 #include "cc/input/page_scale_animation.h" 20 #include "cc/input/page_scale_animation.h"
21 #include "cc/layers/heads_up_display_layer_impl.h" 21 #include "cc/layers/heads_up_display_layer_impl.h"
22 #include "cc/layers/layer.h" 22 #include "cc/layers/layer.h"
23 #include "cc/layers/layer_iterator.h" 23 #include "cc/layers/layer_iterator.h"
24 #include "cc/layers/render_surface_impl.h" 24 #include "cc/layers/render_surface_impl.h"
25 #include "cc/layers/scrollbar_layer_impl_base.h" 25 #include "cc/layers/scrollbar_layer_impl_base.h"
26 #include "cc/resources/ui_resource_request.h" 26 #include "cc/resources/ui_resource_request.h"
27 #include "cc/trees/layer_tree_host_common.h" 27 #include "cc/trees/layer_tree_host_common.h"
28 #include "cc/trees/layer_tree_host_impl.h" 28 #include "cc/trees/layer_tree_host_impl.h"
29 #include "cc/trees/occlusion_tracker.h" 29 #include "cc/trees/occlusion_tracker.h"
30 #include "ui/gfx/point_conversions.h" 30 #include "ui/gfx/geometry/point_conversions.h"
31 #include "ui/gfx/size_conversions.h" 31 #include "ui/gfx/geometry/size_conversions.h"
32 #include "ui/gfx/vector2d_conversions.h" 32 #include "ui/gfx/geometry/vector2d_conversions.h"
33 33
34 namespace cc { 34 namespace cc {
35 35
36 // This class exists to split the LayerScrollOffsetDelegate between the 36 // This class exists to split the LayerScrollOffsetDelegate between the
37 // InnerViewportScrollLayer and the OuterViewportScrollLayer in a manner 37 // InnerViewportScrollLayer and the OuterViewportScrollLayer in a manner
38 // that never requires the embedder or LayerImpl to know about. 38 // that never requires the embedder or LayerImpl to know about.
39 class LayerScrollOffsetDelegateProxy : public LayerImpl::ScrollOffsetDelegate { 39 class LayerScrollOffsetDelegateProxy : public LayerImpl::ScrollOffsetDelegate {
40 public: 40 public:
41 LayerScrollOffsetDelegateProxy(LayerImpl* layer, 41 LayerScrollOffsetDelegateProxy(LayerImpl* layer,
42 LayerScrollOffsetDelegate* delegate, 42 LayerScrollOffsetDelegate* delegate,
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1515 page_scale, 1515 page_scale,
1516 duration.InSecondsF()); 1516 duration.InSecondsF());
1517 } 1517 }
1518 } 1518 }
1519 1519
1520 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { 1520 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() {
1521 return page_scale_animation_.Pass(); 1521 return page_scale_animation_.Pass();
1522 } 1522 }
1523 1523
1524 } // namespace cc 1524 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_scroll.cc ('k') | cc/trees/layer_tree_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698