| 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/single_thread_proxy.h" | 5 #include "cc/trees/single_thread_proxy.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/profiler/scoped_tracker.h" | 9 #include "base/profiler/scoped_tracker.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 DCHECK(task_runner_provider_->IsMainThread()); | 213 DCHECK(task_runner_provider_->IsMainThread()); |
| 214 | 214 |
| 215 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509 is | 215 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509 is |
| 216 // fixed. | 216 // fixed. |
| 217 tracked_objects::ScopedTracker tracking_profile1( | 217 tracked_objects::ScopedTracker tracking_profile1( |
| 218 FROM_HERE_WITH_EXPLICIT_FUNCTION("461509 SingleThreadProxy::DoCommit1")); | 218 FROM_HERE_WITH_EXPLICIT_FUNCTION("461509 SingleThreadProxy::DoCommit1")); |
| 219 layer_tree_host_->WillCommit(); | 219 layer_tree_host_->WillCommit(); |
| 220 devtools_instrumentation::ScopedCommitTrace commit_task( | 220 devtools_instrumentation::ScopedCommitTrace commit_task( |
| 221 layer_tree_host_->id()); | 221 layer_tree_host_->id()); |
| 222 | 222 |
| 223 layer_tree_host_->ReportFixedRasterScaleUseCounters( | |
| 224 layer_tree_host_impl_->has_fixed_raster_scale_blurry_content(), | |
| 225 layer_tree_host_impl_ | |
| 226 ->HasFixedRasterScalePotentialPerformanceRegression()); | |
| 227 | |
| 228 // Commit immediately. | 223 // Commit immediately. |
| 229 { | 224 { |
| 230 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509 | 225 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509 |
| 231 // is fixed. | 226 // is fixed. |
| 232 tracked_objects::ScopedTracker tracking_profile2( | 227 tracked_objects::ScopedTracker tracking_profile2( |
| 233 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 228 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 234 "461509 SingleThreadProxy::DoCommit2")); | 229 "461509 SingleThreadProxy::DoCommit2")); |
| 235 DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_); | 230 DebugScopedSetMainThreadBlocked main_thread_blocked(task_runner_provider_); |
| 236 DebugScopedSetImplThread impl(task_runner_provider_); | 231 DebugScopedSetImplThread impl(task_runner_provider_); |
| 237 | 232 |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 void SingleThreadProxy::DidFinishImplFrame() { | 881 void SingleThreadProxy::DidFinishImplFrame() { |
| 887 layer_tree_host_impl_->DidFinishImplFrame(); | 882 layer_tree_host_impl_->DidFinishImplFrame(); |
| 888 #if DCHECK_IS_ON() | 883 #if DCHECK_IS_ON() |
| 889 DCHECK(inside_impl_frame_) | 884 DCHECK(inside_impl_frame_) |
| 890 << "DidFinishImplFrame called while not inside an impl frame!"; | 885 << "DidFinishImplFrame called while not inside an impl frame!"; |
| 891 inside_impl_frame_ = false; | 886 inside_impl_frame_ = false; |
| 892 #endif | 887 #endif |
| 893 } | 888 } |
| 894 | 889 |
| 895 } // namespace cc | 890 } // namespace cc |
| OLD | NEW |