| 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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 // the apply/animate/layout part of the BeginMainFrameAndCommit process since | 783 // the apply/animate/layout part of the BeginMainFrameAndCommit process since |
| 784 // those commit requests will get painted immediately. Once we have done | 784 // those commit requests will get painted immediately. Once we have done |
| 785 // the paint, main().commit_requested will be set to false to allow new commit | 785 // the paint, main().commit_requested will be set to false to allow new commit |
| 786 // requests to be scheduled. | 786 // requests to be scheduled. |
| 787 // On the other hand, the animate_requested flag should remain cleared | 787 // On the other hand, the animate_requested flag should remain cleared |
| 788 // here so that any animation requests generated by the apply or animate | 788 // here so that any animation requests generated by the apply or animate |
| 789 // callbacks will trigger another frame. | 789 // callbacks will trigger another frame. |
| 790 main().commit_requested = true; | 790 main().commit_requested = true; |
| 791 main().commit_request_sent_to_impl_thread = true; | 791 main().commit_request_sent_to_impl_thread = true; |
| 792 | 792 |
| 793 layer_tree_host()->ApplyScrollAndScale( | 793 layer_tree_host()->ApplyScrollAndScale(*begin_main_frame_state->scroll_info); |
| 794 begin_main_frame_state->scroll_info.get()); | |
| 795 | 794 |
| 796 layer_tree_host()->WillBeginMainFrame(); | 795 layer_tree_host()->WillBeginMainFrame(); |
| 797 | 796 |
| 798 layer_tree_host()->UpdateClientAnimations( | 797 layer_tree_host()->UpdateClientAnimations( |
| 799 begin_main_frame_state->monotonic_frame_begin_time); | 798 begin_main_frame_state->monotonic_frame_begin_time); |
| 800 layer_tree_host()->AnimateLayers( | 799 layer_tree_host()->AnimateLayers( |
| 801 begin_main_frame_state->monotonic_frame_begin_time); | 800 begin_main_frame_state->monotonic_frame_begin_time); |
| 802 blocked_main().last_monotonic_frame_begin_time = | 801 blocked_main().last_monotonic_frame_begin_time = |
| 803 begin_main_frame_state->monotonic_frame_begin_time; | 802 begin_main_frame_state->monotonic_frame_begin_time; |
| 804 | 803 |
| (...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1414 | 1413 |
| 1415 impl().timing_history.DidActivateSyncTree(); | 1414 impl().timing_history.DidActivateSyncTree(); |
| 1416 } | 1415 } |
| 1417 | 1416 |
| 1418 void ThreadProxy::DidManageTiles() { | 1417 void ThreadProxy::DidManageTiles() { |
| 1419 DCHECK(IsImplThread()); | 1418 DCHECK(IsImplThread()); |
| 1420 impl().scheduler->DidManageTiles(); | 1419 impl().scheduler->DidManageTiles(); |
| 1421 } | 1420 } |
| 1422 | 1421 |
| 1423 } // namespace cc | 1422 } // namespace cc |
| OLD | NEW |