| 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 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1298 *main_frame_will_happen = false; | 1298 *main_frame_will_happen = false; |
| 1299 } | 1299 } |
| 1300 completion->Signal(); | 1300 completion->Signal(); |
| 1301 } | 1301 } |
| 1302 | 1302 |
| 1303 void ThreadProxy::RenewTreePriority() { | 1303 void ThreadProxy::RenewTreePriority() { |
| 1304 DCHECK(IsImplThread()); | 1304 DCHECK(IsImplThread()); |
| 1305 bool smoothness_takes_priority = | 1305 bool smoothness_takes_priority = |
| 1306 impl().layer_tree_host_impl->pinch_gesture_active() || | 1306 impl().layer_tree_host_impl->pinch_gesture_active() || |
| 1307 impl().layer_tree_host_impl->page_scale_animation_active() || | 1307 impl().layer_tree_host_impl->page_scale_animation_active() || |
| 1308 impl().layer_tree_host_impl->IsCurrentlyScrolling(); | 1308 impl().layer_tree_host_impl->IsActivelyScrolling(); |
| 1309 | 1309 |
| 1310 // Schedule expiration if smoothness currently takes priority. | 1310 // Schedule expiration if smoothness currently takes priority. |
| 1311 if (smoothness_takes_priority) | 1311 if (smoothness_takes_priority) |
| 1312 impl().smoothness_priority_expiration_notifier.Schedule(); | 1312 impl().smoothness_priority_expiration_notifier.Schedule(); |
| 1313 | 1313 |
| 1314 // We use the same priority for both trees by default. | 1314 // We use the same priority for both trees by default. |
| 1315 TreePriority priority = SAME_PRIORITY_FOR_BOTH_TREES; | 1315 TreePriority priority = SAME_PRIORITY_FOR_BOTH_TREES; |
| 1316 | 1316 |
| 1317 // Smoothness takes priority if we have an expiration for it scheduled. | 1317 // Smoothness takes priority if we have an expiration for it scheduled. |
| 1318 if (impl().smoothness_priority_expiration_notifier.HasPendingNotification()) | 1318 if (impl().smoothness_priority_expiration_notifier.HasPendingNotification()) |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1373 | 1373 |
| 1374 impl().timing_history.DidActivateSyncTree(); | 1374 impl().timing_history.DidActivateSyncTree(); |
| 1375 } | 1375 } |
| 1376 | 1376 |
| 1377 void ThreadProxy::DidManageTiles() { | 1377 void ThreadProxy::DidManageTiles() { |
| 1378 DCHECK(IsImplThread()); | 1378 DCHECK(IsImplThread()); |
| 1379 impl().scheduler->DidManageTiles(); | 1379 impl().scheduler->DidManageTiles(); |
| 1380 } | 1380 } |
| 1381 | 1381 |
| 1382 } // namespace cc | 1382 } // namespace cc |
| OLD | NEW |