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