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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 // the apply/animate/layout part of the BeginMainFrameAndCommit process since | 759 // the apply/animate/layout part of the BeginMainFrameAndCommit process since |
760 // those commit requests will get painted immediately. Once we have done | 760 // those commit requests will get painted immediately. Once we have done |
761 // the paint, main().commit_requested will be set to false to allow new commit | 761 // the paint, main().commit_requested will be set to false to allow new commit |
762 // requests to be scheduled. | 762 // requests to be scheduled. |
763 // On the other hand, the animate_requested flag should remain cleared | 763 // On the other hand, the animate_requested flag should remain cleared |
764 // here so that any animation requests generated by the apply or animate | 764 // here so that any animation requests generated by the apply or animate |
765 // callbacks will trigger another frame. | 765 // callbacks will trigger another frame. |
766 main().commit_requested = true; | 766 main().commit_requested = true; |
767 main().commit_request_sent_to_impl_thread = true; | 767 main().commit_request_sent_to_impl_thread = true; |
768 | 768 |
769 layer_tree_host()->ApplyScrollAndScale(*begin_main_frame_state->scroll_info); | 769 layer_tree_host()->ApplyScrollAndScale( |
| 770 begin_main_frame_state->scroll_info.get()); |
770 | 771 |
771 layer_tree_host()->WillBeginMainFrame(); | 772 layer_tree_host()->WillBeginMainFrame(); |
772 | 773 |
773 layer_tree_host()->UpdateClientAnimations( | 774 layer_tree_host()->UpdateClientAnimations( |
774 begin_main_frame_state->monotonic_frame_begin_time); | 775 begin_main_frame_state->monotonic_frame_begin_time); |
775 layer_tree_host()->AnimateLayers( | 776 layer_tree_host()->AnimateLayers( |
776 begin_main_frame_state->monotonic_frame_begin_time); | 777 begin_main_frame_state->monotonic_frame_begin_time); |
777 blocked_main().last_monotonic_frame_begin_time = | 778 blocked_main().last_monotonic_frame_begin_time = |
778 begin_main_frame_state->monotonic_frame_begin_time; | 779 begin_main_frame_state->monotonic_frame_begin_time; |
779 | 780 |
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1390 | 1391 |
1391 impl().timing_history.DidActivateSyncTree(); | 1392 impl().timing_history.DidActivateSyncTree(); |
1392 } | 1393 } |
1393 | 1394 |
1394 void ThreadProxy::DidManageTiles() { | 1395 void ThreadProxy::DidManageTiles() { |
1395 DCHECK(IsImplThread()); | 1396 DCHECK(IsImplThread()); |
1396 impl().scheduler->DidManageTiles(); | 1397 impl().scheduler->DidManageTiles(); |
1397 } | 1398 } |
1398 | 1399 |
1399 } // namespace cc | 1400 } // namespace cc |
OLD | NEW |