cc/layers/layer_impl.cc - Issue 660333004: cc cleanup: Update paths to geometry headers

Side by Side Diff: cc/layers/layer_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, 1 month 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/layers/layer_impl.h ('k') | cc/layers/layer_utils.cc » ('j') | no next file with comments »

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/layers/layer_impl.h"	5 #include "cc/layers/layer_impl.h"

6	6

7 #include "base/debug/trace_event.h"	7 #include "base/debug/trace_event.h"

8 #include "base/debug/trace_event_argument.h"	8 #include "base/debug/trace_event_argument.h"

9 #include "base/json/json_reader.h"	9 #include "base/json/json_reader.h"

10 #include "base/strings/stringprintf.h"	10 #include "base/strings/stringprintf.h"

11 #include "cc/animation/animation_registrar.h"	11 #include "cc/animation/animation_registrar.h"

12 #include "cc/animation/scrollbar_animation_controller.h"	12 #include "cc/animation/scrollbar_animation_controller.h"

13 #include "cc/base/math_util.h"	13 #include "cc/base/math_util.h"

14 #include "cc/base/simple_enclosed_region.h"	14 #include "cc/base/simple_enclosed_region.h"

15 #include "cc/debug/debug_colors.h"	15 #include "cc/debug/debug_colors.h"

16 #include "cc/debug/layer_tree_debug_state.h"	16 #include "cc/debug/layer_tree_debug_state.h"

17 #include "cc/debug/micro_benchmark_impl.h"	17 #include "cc/debug/micro_benchmark_impl.h"

18 #include "cc/debug/traced_value.h"	18 #include "cc/debug/traced_value.h"

19 #include "cc/input/layer_scroll_offset_delegate.h"	19 #include "cc/input/layer_scroll_offset_delegate.h"

20 #include "cc/layers/layer_utils.h"	20 #include "cc/layers/layer_utils.h"

21 #include "cc/layers/painted_scrollbar_layer_impl.h"	21 #include "cc/layers/painted_scrollbar_layer_impl.h"

22 #include "cc/output/copy_output_request.h"	22 #include "cc/output/copy_output_request.h"

23 #include "cc/quads/debug_border_draw_quad.h"	23 #include "cc/quads/debug_border_draw_quad.h"

24 #include "cc/quads/render_pass.h"	24 #include "cc/quads/render_pass.h"

25 #include "cc/trees/layer_tree_host_common.h"	25 #include "cc/trees/layer_tree_host_common.h"

26 #include "cc/trees/layer_tree_impl.h"	26 #include "cc/trees/layer_tree_impl.h"

27 #include "cc/trees/layer_tree_settings.h"	27 #include "cc/trees/layer_tree_settings.h"

28 #include "cc/trees/proxy.h"	28 #include "cc/trees/proxy.h"

29 #include "ui/gfx/box_f.h"	29 #include "ui/gfx/geometry/box_f.h"

	30 #include "ui/gfx/geometry/point_conversions.h"

	31 #include "ui/gfx/geometry/quad_f.h"

	32 #include "ui/gfx/geometry/rect_conversions.h"

	33 #include "ui/gfx/geometry/size_conversions.h"

30 #include "ui/gfx/geometry/vector2d_conversions.h"	34 #include "ui/gfx/geometry/vector2d_conversions.h"

31 #include "ui/gfx/point_conversions.h"

32 #include "ui/gfx/quad_f.h"

33 #include "ui/gfx/rect_conversions.h"

34 #include "ui/gfx/size_conversions.h"

35	35

36 namespace cc {	36 namespace cc {

37 LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)	37 LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)

38 : parent_(nullptr),	38 : parent_(nullptr),

39 scroll_parent_(nullptr),	39 scroll_parent_(nullptr),

40 clip_parent_(nullptr),	40 clip_parent_(nullptr),

41 mask_layer_id_(-1),	41 mask_layer_id_(-1),

42 replica_layer_id_(-1),	42 replica_layer_id_(-1),

43 layer_id_(id),	43 layer_id_(id),

44 layer_tree_impl_(tree_impl),	44 layer_tree_impl_(tree_impl),

(...skipping 1542 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1587	1587

1588 void LayerImpl::NotifyAnimationFinished(	1588 void LayerImpl::NotifyAnimationFinished(

1589 base::TimeTicks monotonic_time,	1589 base::TimeTicks monotonic_time,

1590 Animation::TargetProperty target_property,	1590 Animation::TargetProperty target_property,

1591 int group) {	1591 int group) {

1592 if (target_property == Animation::ScrollOffset)	1592 if (target_property == Animation::ScrollOffset)

1593 layer_tree_impl_->InputScrollAnimationFinished();	1593 layer_tree_impl_->InputScrollAnimationFinished();

1594 }	1594 }

1595	1595

1596 } // namespace cc	1596 } // namespace cc

OLD	NEW