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/thread_proxy.h" | 5 #include "cc/trees/thread_proxy.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
772 // the apply/animate/layout part of the BeginMainFrameAndCommit process since | 772 // the apply/animate/layout part of the BeginMainFrameAndCommit process since |
773 // those commit requests will get painted immediately. Once we have done | 773 // those commit requests will get painted immediately. Once we have done |
774 // the paint, main().commit_requested will be set to false to allow new commit | 774 // the paint, main().commit_requested will be set to false to allow new commit |
775 // requests to be scheduled. | 775 // requests to be scheduled. |
776 // On the other hand, the animate_requested flag should remain cleared | 776 // On the other hand, the animate_requested flag should remain cleared |
777 // here so that any animation requests generated by the apply or animate | 777 // here so that any animation requests generated by the apply or animate |
778 // callbacks will trigger another frame. | 778 // callbacks will trigger another frame. |
779 main().commit_requested = true; | 779 main().commit_requested = true; |
780 main().commit_request_sent_to_impl_thread = true; | 780 main().commit_request_sent_to_impl_thread = true; |
781 | 781 |
782 layer_tree_host()->ApplyScrollAndScale(*begin_main_frame_state->scroll_info); | 782 layer_tree_host()->ApplyScrollAndScale( |
| 783 begin_main_frame_state->scroll_info.get()); |
783 | 784 |
784 layer_tree_host()->WillBeginMainFrame(); | 785 layer_tree_host()->WillBeginMainFrame(); |
785 | 786 |
786 layer_tree_host()->UpdateClientAnimations( | 787 layer_tree_host()->UpdateClientAnimations( |
787 begin_main_frame_state->monotonic_frame_begin_time); | 788 begin_main_frame_state->monotonic_frame_begin_time); |
788 layer_tree_host()->AnimateLayers( | 789 layer_tree_host()->AnimateLayers( |
789 begin_main_frame_state->monotonic_frame_begin_time); | 790 begin_main_frame_state->monotonic_frame_begin_time); |
790 blocked_main().last_monotonic_frame_begin_time = | 791 blocked_main().last_monotonic_frame_begin_time = |
791 begin_main_frame_state->monotonic_frame_begin_time; | 792 begin_main_frame_state->monotonic_frame_begin_time; |
792 | 793 |
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1446 | 1447 |
1447 impl().timing_history.DidActivateSyncTree(); | 1448 impl().timing_history.DidActivateSyncTree(); |
1448 } | 1449 } |
1449 | 1450 |
1450 void ThreadProxy::DidManageTiles() { | 1451 void ThreadProxy::DidManageTiles() { |
1451 DCHECK(IsImplThread()); | 1452 DCHECK(IsImplThread()); |
1452 impl().scheduler->DidManageTiles(); | 1453 impl().scheduler->DidManageTiles(); |
1453 } | 1454 } |
1454 | 1455 |
1455 } // namespace cc | 1456 } // namespace cc |
OLD | NEW |