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_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1476 if (!InnerViewportScrollLayer()) | 1476 if (!InnerViewportScrollLayer()) |
1477 return metadata; | 1477 return metadata; |
1478 | 1478 |
1479 // TODO(miletus) : Change the metadata to hold ScrollOffset. | 1479 // TODO(miletus) : Change the metadata to hold ScrollOffset. |
1480 metadata.root_scroll_offset = gfx::ScrollOffsetToVector2dF( | 1480 metadata.root_scroll_offset = gfx::ScrollOffsetToVector2dF( |
1481 active_tree_->TotalScrollOffset()); | 1481 active_tree_->TotalScrollOffset()); |
1482 | 1482 |
1483 return metadata; | 1483 return metadata; |
1484 } | 1484 } |
1485 | 1485 |
1486 void LayerTreeHostImpl::DrawLayers(FrameData* frame, | 1486 void LayerTreeHostImpl::DrawLayers(FrameData* frame) { |
1487 base::TimeTicks frame_begin_time) { | |
1488 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); | 1487 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); |
| 1488 |
| 1489 base::TimeTicks frame_begin_time = CurrentBeginFrameArgs().frame_time; |
1489 DCHECK(CanDraw()); | 1490 DCHECK(CanDraw()); |
1490 | 1491 |
1491 if (!frame->composite_events.empty()) { | 1492 if (!frame->composite_events.empty()) { |
1492 frame_timing_tracker_->SaveTimeStamps(frame_begin_time, | 1493 frame_timing_tracker_->SaveTimeStamps(frame_begin_time, |
1493 frame->composite_events); | 1494 frame->composite_events); |
1494 } | 1495 } |
1495 | 1496 |
1496 if (frame->has_no_damage) { | 1497 if (frame->has_no_damage) { |
1497 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); | 1498 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); |
1498 DCHECK(!output_surface_->capabilities() | 1499 DCHECK(!output_surface_->capabilities() |
(...skipping 1911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3410 new_target.SetToMin(layer_impl->MaxScrollOffset()); | 3411 new_target.SetToMin(layer_impl->MaxScrollOffset()); |
3411 | 3412 |
3412 curve->UpdateTarget( | 3413 curve->UpdateTarget( |
3413 animation->TrimTimeToCurrentIteration(CurrentBeginFrameArgs().frame_time) | 3414 animation->TrimTimeToCurrentIteration(CurrentBeginFrameArgs().frame_time) |
3414 .InSecondsF(), | 3415 .InSecondsF(), |
3415 new_target); | 3416 new_target); |
3416 | 3417 |
3417 return true; | 3418 return true; |
3418 } | 3419 } |
3419 } // namespace cc | 3420 } // namespace cc |
OLD | NEW |