Chromium Code Reviews| 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 "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "cc/base/thread.h" | 10 #include "cc/base/thread.h" |
| 11 #include "cc/input/input_handler.h" | 11 #include "cc/input/input_handler.h" |
| 12 #include "cc/output/context_provider.h" | 12 #include "cc/output/context_provider.h" |
| 13 #include "cc/output/output_surface.h" | 13 #include "cc/output/output_surface.h" |
| 14 #include "cc/quads/draw_quad.h" | 14 #include "cc/quads/draw_quad.h" |
| 15 #include "cc/resources/prioritized_resource_manager.h" | 15 #include "cc/resources/prioritized_resource_manager.h" |
| 16 #include "cc/scheduler/delay_based_time_source.h" | 16 #include "cc/scheduler/delay_based_time_source.h" |
| 17 #include "cc/scheduler/frame_rate_controller.h" | 17 #include "cc/scheduler/frame_rate_controller.h" |
| 18 #include "cc/scheduler/scheduler.h" | 18 #include "cc/scheduler/scheduler.h" |
| 19 #include "cc/scheduler/vsync_time_source.h" | |
| 20 #include "cc/trees/layer_tree_host.h" | 19 #include "cc/trees/layer_tree_host.h" |
| 21 #include "cc/trees/layer_tree_impl.h" | 20 #include "cc/trees/layer_tree_impl.h" |
| 22 | 21 |
| 23 namespace { | 22 namespace { |
| 24 | 23 |
| 25 // Measured in seconds. | 24 // Measured in seconds. |
| 26 const double kContextRecreationTickRate = 0.03; | 25 const double kContextRecreationTickRate = 0.03; |
| 27 | 26 |
| 28 // Measured in seconds. | 27 // Measured in seconds. |
| 29 const double kSmoothnessTakesPriorityExpirationDelay = 0.25; | 28 const double kSmoothnessTakesPriorityExpirationDelay = 0.25; |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 57 commit_completion_event_on_impl_thread_(NULL), | 56 commit_completion_event_on_impl_thread_(NULL), |
| 58 completion_event_for_commit_held_on_tree_activation_(NULL), | 57 completion_event_for_commit_held_on_tree_activation_(NULL), |
| 59 texture_acquisition_completion_event_on_impl_thread_(NULL), | 58 texture_acquisition_completion_event_on_impl_thread_(NULL), |
| 60 next_frame_is_newly_committed_frame_on_impl_thread_(false), | 59 next_frame_is_newly_committed_frame_on_impl_thread_(false), |
| 61 throttle_frame_production_( | 60 throttle_frame_production_( |
| 62 layer_tree_host->settings().throttle_frame_production), | 61 layer_tree_host->settings().throttle_frame_production), |
| 63 begin_frame_scheduling_enabled_( | 62 begin_frame_scheduling_enabled_( |
| 64 layer_tree_host->settings().begin_frame_scheduling_enabled), | 63 layer_tree_host->settings().begin_frame_scheduling_enabled), |
| 65 using_synchronous_renderer_compositor_( | 64 using_synchronous_renderer_compositor_( |
| 66 layer_tree_host->settings().using_synchronous_renderer_compositor), | 65 layer_tree_host->settings().using_synchronous_renderer_compositor), |
| 67 vsync_client_(NULL), | |
| 68 inside_draw_(false), | 66 inside_draw_(false), |
| 69 defer_commits_(false), | 67 defer_commits_(false), |
| 70 renew_tree_priority_on_impl_thread_pending_(false) { | 68 renew_tree_priority_on_impl_thread_pending_(false) { |
| 71 TRACE_EVENT0("cc", "ThreadProxy::ThreadProxy"); | 69 TRACE_EVENT0("cc", "ThreadProxy::ThreadProxy"); |
| 72 DCHECK(IsMainThread()); | 70 DCHECK(IsMainThread()); |
| 73 DCHECK(layer_tree_host_); | 71 DCHECK(layer_tree_host_); |
| 74 } | 72 } |
| 75 | 73 |
| 76 ThreadProxy::~ThreadProxy() { | 74 ThreadProxy::~ThreadProxy() { |
| 77 TRACE_EVENT0("cc", "ThreadProxy::~ThreadProxy"); | 75 TRACE_EVENT0("cc", "ThreadProxy::~ThreadProxy"); |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 321 offscreen_context_provider() : NULL; | 319 offscreen_context_provider() : NULL; |
| 322 | 320 |
| 323 if (offscreen_contexts) | 321 if (offscreen_contexts) |
| 324 offscreen_contexts->VerifyContexts(); | 322 offscreen_contexts->VerifyContexts(); |
| 325 scheduler_on_impl_thread_->DidLoseOutputSurface(); | 323 scheduler_on_impl_thread_->DidLoseOutputSurface(); |
| 326 } | 324 } |
| 327 | 325 |
| 328 void ThreadProxy::OnSwapBuffersCompleteOnImplThread() { | 326 void ThreadProxy::OnSwapBuffersCompleteOnImplThread() { |
| 329 DCHECK(IsImplThread()); | 327 DCHECK(IsImplThread()); |
| 330 TRACE_EVENT0("cc", "ThreadProxy::OnSwapBuffersCompleteOnImplThread"); | 328 TRACE_EVENT0("cc", "ThreadProxy::OnSwapBuffersCompleteOnImplThread"); |
| 331 scheduler_on_impl_thread_->DidSwapBuffersComplete(); | |
| 332 Proxy::MainThread()->PostTask( | 329 Proxy::MainThread()->PostTask( |
| 333 base::Bind(&ThreadProxy::DidCompleteSwapBuffers, main_thread_weak_ptr_)); | 330 base::Bind(&ThreadProxy::DidCompleteSwapBuffers, main_thread_weak_ptr_)); |
| 334 } | 331 } |
| 335 | 332 |
| 336 void ThreadProxy::OnVSyncParametersChanged(base::TimeTicks timebase, | 333 void ThreadProxy::SetNeedsBeginFrameOnImplThread(bool enable) { |
| 337 base::TimeDelta interval) { | |
| 338 DCHECK(IsImplThread()); | 334 DCHECK(IsImplThread()); |
| 339 TRACE_EVENT2("cc", | 335 TRACE_EVENT1("cc", "ThreadProxy::SetNeedsBeginFrameOnImplThread", |
| 340 "ThreadProxy::OnVSyncParametersChanged", | 336 "enable", enable); |
| 341 "timebase", | 337 layer_tree_host_impl_->SetNeedsBeginFrame(enable); |
| 342 (timebase - base::TimeTicks()).InMilliseconds(), | |
| 343 "interval", | |
| 344 interval.InMilliseconds()); | |
| 345 scheduler_on_impl_thread_->SetTimebaseAndInterval(timebase, interval); | |
| 346 } | 338 } |
| 347 | 339 |
| 348 void ThreadProxy::BeginFrameOnImplThread(base::TimeTicks frame_time) { | 340 void ThreadProxy::BeginFrameOnImplThread(base::TimeTicks frame_time) { |
| 349 DCHECK(IsImplThread()); | 341 DCHECK(IsImplThread()); |
| 350 TRACE_EVENT0("cc", "ThreadProxy::OnBeginFrameOnImplThread"); | 342 TRACE_EVENT0("cc", "ThreadProxy::BeginFrameOnImplThread"); |
| 351 if (vsync_client_) | 343 scheduler_on_impl_thread_->BeginFrame(frame_time); |
| 352 vsync_client_->DidVSync(frame_time); | |
| 353 } | |
| 354 | |
| 355 void ThreadProxy::RequestVSyncNotification(VSyncClient* client) { | |
| 356 DCHECK(IsImplThread()); | |
| 357 TRACE_EVENT1( | |
| 358 "cc", "ThreadProxy::RequestVSyncNotification", "enable", !!client); | |
| 359 vsync_client_ = client; | |
| 360 layer_tree_host_impl_->SetNeedsBeginFrame(!!client); | |
| 361 } | 344 } |
| 362 | 345 |
| 363 void ThreadProxy::OnCanDrawStateChanged(bool can_draw) { | 346 void ThreadProxy::OnCanDrawStateChanged(bool can_draw) { |
| 364 DCHECK(IsImplThread()); | 347 DCHECK(IsImplThread()); |
| 365 TRACE_EVENT1( | 348 TRACE_EVENT1( |
| 366 "cc", "ThreadProxy::OnCanDrawStateChanged", "can_draw", can_draw); | 349 "cc", "ThreadProxy::OnCanDrawStateChanged", "can_draw", can_draw); |
| 367 scheduler_on_impl_thread_->SetCanDraw(can_draw); | 350 scheduler_on_impl_thread_->SetCanDraw(can_draw); |
| 368 layer_tree_host_impl_->UpdateBackgroundAnimateTicking( | 351 layer_tree_host_impl_->UpdateBackgroundAnimateTicking( |
| 369 !scheduler_on_impl_thread_->WillDrawIfNeeded()); | 352 !scheduler_on_impl_thread_->WillDrawIfNeeded()); |
| 370 } | 353 } |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1103 DCHECK(IsImplThread()); | 1086 DCHECK(IsImplThread()); |
| 1104 *has_initialized_output_surface = | 1087 *has_initialized_output_surface = |
| 1105 scheduler_on_impl_thread_->HasInitializedOutputSurface(); | 1088 scheduler_on_impl_thread_->HasInitializedOutputSurface(); |
| 1106 completion->Signal(); | 1089 completion->Signal(); |
| 1107 } | 1090 } |
| 1108 | 1091 |
| 1109 void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) { | 1092 void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) { |
| 1110 TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread"); | 1093 TRACE_EVENT0("cc", "ThreadProxy::InitializeImplOnImplThread"); |
| 1111 DCHECK(IsImplThread()); | 1094 DCHECK(IsImplThread()); |
| 1112 layer_tree_host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this); | 1095 layer_tree_host_impl_ = layer_tree_host_->CreateLayerTreeHostImpl(this); |
| 1113 const base::TimeDelta display_refresh_interval = | |
| 1114 base::TimeDelta::FromMicroseconds( | |
| 1115 base::Time::kMicrosecondsPerSecond / | |
| 1116 layer_tree_host_->settings().refresh_rate); | |
| 1117 scoped_ptr<FrameRateController> frame_rate_controller; | |
| 1118 if (throttle_frame_production_) { | |
| 1119 if (begin_frame_scheduling_enabled_) { | |
| 1120 frame_rate_controller.reset( | |
| 1121 new FrameRateController(VSyncTimeSource::Create( | |
| 1122 this, | |
| 1123 using_synchronous_renderer_compositor_ ? | |
| 1124 VSyncTimeSource::DISABLE_SYNCHRONOUSLY : | |
| 1125 VSyncTimeSource::DISABLE_ON_NEXT_TICK))); | |
| 1126 } else { | |
| 1127 frame_rate_controller.reset( | |
| 1128 new FrameRateController(DelayBasedTimeSource::Create( | |
| 1129 display_refresh_interval, Proxy::ImplThread()))); | |
| 1130 } | |
| 1131 } else { | |
| 1132 frame_rate_controller.reset(new FrameRateController(Proxy::ImplThread())); | |
| 1133 } | |
| 1134 const LayerTreeSettings& settings = layer_tree_host_->settings(); | 1096 const LayerTreeSettings& settings = layer_tree_host_->settings(); |
| 1135 SchedulerSettings scheduler_settings; | 1097 SchedulerSettings scheduler_settings; |
| 1136 scheduler_settings.impl_side_painting = settings.impl_side_painting; | 1098 scheduler_settings.impl_side_painting = settings.impl_side_painting; |
| 1137 scheduler_settings.timeout_and_draw_when_animation_checkerboards = | 1099 scheduler_settings.timeout_and_draw_when_animation_checkerboards = |
| 1138 settings.timeout_and_draw_when_animation_checkerboards; | 1100 settings.timeout_and_draw_when_animation_checkerboards; |
| 1139 scheduler_on_impl_thread_ = Scheduler::Create(this, | 1101 scheduler_settings.using_synchronous_renderer_compositor = |
| 1140 frame_rate_controller.Pass(), | 1102 settings.using_synchronous_renderer_compositor; |
| 1141 scheduler_settings); | 1103 scheduler_on_impl_thread_ = |
| 1104 Scheduler::Create(this, scheduler_settings, Proxy::ImplThread()); | |
| 1142 scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible()); | 1105 scheduler_on_impl_thread_->SetVisible(layer_tree_host_impl_->visible()); |
| 1143 | 1106 |
| 1144 impl_thread_weak_ptr_ = weak_factory_on_impl_thread_.GetWeakPtr(); | 1107 impl_thread_weak_ptr_ = weak_factory_on_impl_thread_.GetWeakPtr(); |
| 1145 completion->Signal(); | 1108 completion->Signal(); |
| 1146 } | 1109 } |
| 1147 | 1110 |
| 1148 void ThreadProxy::InitializeOutputSurfaceOnImplThread( | 1111 void ThreadProxy::InitializeOutputSurfaceOnImplThread( |
| 1149 CompletionEvent* completion, | 1112 CompletionEvent* completion, |
| 1150 scoped_ptr<OutputSurface> output_surface, | 1113 scoped_ptr<OutputSurface> output_surface, |
| 1151 scoped_refptr<ContextProvider> offscreen_context_provider, | 1114 scoped_refptr<ContextProvider> offscreen_context_provider, |
| 1152 bool* success, | 1115 bool* success, |
| 1153 RendererCapabilities* capabilities) { | 1116 RendererCapabilities* capabilities) { |
| 1154 TRACE_EVENT0("cc", "ThreadProxy::InitializeOutputSurfaceOnImplThread"); | 1117 TRACE_EVENT0("cc", "ThreadProxy::InitializeOutputSurfaceOnImplThread"); |
| 1155 DCHECK(IsImplThread()); | 1118 DCHECK(IsImplThread()); |
| 1156 DCHECK(IsMainThreadBlocked()); | 1119 DCHECK(IsMainThreadBlocked()); |
| 1157 DCHECK(success); | 1120 DCHECK(success); |
| 1158 DCHECK(capabilities); | 1121 DCHECK(capabilities); |
| 1159 | 1122 |
| 1160 layer_tree_host_->DeleteContentsTexturesOnImplThread( | 1123 layer_tree_host_->DeleteContentsTexturesOnImplThread( |
| 1161 layer_tree_host_impl_->resource_provider()); | 1124 layer_tree_host_impl_->resource_provider()); |
| 1162 | 1125 |
| 1163 *success = layer_tree_host_impl_->InitializeRenderer(output_surface.Pass()); | 1126 *success = layer_tree_host_impl_->InitializeRenderer(output_surface.Pass()); |
| 1164 | 1127 |
| 1165 if (offscreen_context_provider) | 1128 if (offscreen_context_provider) |
| 1166 offscreen_context_provider->BindToCurrentThread(); | 1129 offscreen_context_provider->BindToCurrentThread(); |
| 1167 | 1130 |
| 1168 if (*success) { | 1131 if (*success) { |
| 1169 *capabilities = layer_tree_host_impl_->GetRendererCapabilities(); | 1132 *capabilities = layer_tree_host_impl_->GetRendererCapabilities(); |
| 1170 scheduler_on_impl_thread_->SetSwapBuffersCompleteSupported( | |
| 1171 capabilities->using_swap_complete_callback); | |
| 1172 | |
| 1173 OutputSurface* output_surface_ptr = layer_tree_host_impl_->output_surface(); | |
| 1174 DCHECK(output_surface_ptr); | |
| 1175 int max_frames_pending = | |
| 1176 output_surface_ptr->capabilities().max_frames_pending; | |
| 1177 if (max_frames_pending <= 0) | |
| 1178 max_frames_pending = FrameRateController::DEFAULT_MAX_FRAMES_PENDING; | |
| 1179 if (output_surface_ptr->capabilities().has_parent_compositor) | |
| 1180 max_frames_pending = 1; | |
| 1181 | |
| 1182 scheduler_on_impl_thread_->SetMaxFramesPending(max_frames_pending); | |
| 1183 | 1133 |
| 1184 if (layer_tree_host_impl_->resource_provider()) | 1134 if (layer_tree_host_impl_->resource_provider()) |
| 1185 layer_tree_host_impl_->resource_provider()-> | 1135 layer_tree_host_impl_->resource_provider()-> |
| 1186 set_offscreen_context_provider(offscreen_context_provider); | 1136 set_offscreen_context_provider(offscreen_context_provider); |
| 1187 | 1137 |
| 1188 scheduler_on_impl_thread_->DidCreateAndInitializeOutputSurface(); | 1138 scheduler_on_impl_thread_->DidCreateAndInitializeOutputSurface(); |
| 1189 } else if (offscreen_context_provider) { | 1139 } else if (offscreen_context_provider) { |
| 1190 offscreen_context_provider->VerifyContexts(); | 1140 offscreen_context_provider->VerifyContexts(); |
| 1191 } | 1141 } |
| 1192 | 1142 |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 1203 | 1153 |
| 1204 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { | 1154 void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
| 1205 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); | 1155 TRACE_EVENT0("cc", "ThreadProxy::LayerTreeHostClosedOnImplThread"); |
| 1206 DCHECK(IsImplThread()); | 1156 DCHECK(IsImplThread()); |
| 1207 layer_tree_host_->DeleteContentsTexturesOnImplThread( | 1157 layer_tree_host_->DeleteContentsTexturesOnImplThread( |
| 1208 layer_tree_host_impl_->resource_provider()); | 1158 layer_tree_host_impl_->resource_provider()); |
| 1209 layer_tree_host_impl_->SetNeedsBeginFrame(false); | 1159 layer_tree_host_impl_->SetNeedsBeginFrame(false); |
| 1210 scheduler_on_impl_thread_.reset(); | 1160 scheduler_on_impl_thread_.reset(); |
| 1211 layer_tree_host_impl_.reset(); | 1161 layer_tree_host_impl_.reset(); |
| 1212 weak_factory_on_impl_thread_.InvalidateWeakPtrs(); | 1162 weak_factory_on_impl_thread_.InvalidateWeakPtrs(); |
| 1213 vsync_client_ = NULL; | |
| 1214 completion->Signal(); | 1163 completion->Signal(); |
| 1215 } | 1164 } |
| 1216 | 1165 |
| 1217 size_t ThreadProxy::MaxPartialTextureUpdates() const { | 1166 size_t ThreadProxy::MaxPartialTextureUpdates() const { |
| 1218 return ResourceUpdateController::MaxPartialTextureUpdates(); | 1167 return ResourceUpdateController::MaxPartialTextureUpdates(); |
| 1219 } | 1168 } |
| 1220 | 1169 |
| 1221 ThreadProxy::BeginFrameAndCommitState::BeginFrameAndCommitState() | 1170 ThreadProxy::BeginFrameAndCommitState::BeginFrameAndCommitState() |
| 1222 : memory_allocation_limit_bytes(0) {} | 1171 : memory_allocation_limit_bytes(0) {} |
| 1223 | 1172 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1355 RenewTreePriority(); | 1304 RenewTreePriority(); |
| 1356 } | 1305 } |
| 1357 | 1306 |
| 1358 void ThreadProxy::RequestScrollbarAnimationOnImplThread(base::TimeDelta delay) { | 1307 void ThreadProxy::RequestScrollbarAnimationOnImplThread(base::TimeDelta delay) { |
| 1359 Proxy::ImplThread()->PostDelayedTask( | 1308 Proxy::ImplThread()->PostDelayedTask( |
| 1360 base::Bind(&ThreadProxy::StartScrollbarAnimationOnImplThread, | 1309 base::Bind(&ThreadProxy::StartScrollbarAnimationOnImplThread, |
| 1361 impl_thread_weak_ptr_), | 1310 impl_thread_weak_ptr_), |
| 1362 delay); | 1311 delay); |
| 1363 } | 1312 } |
| 1364 | 1313 |
| 1365 void ThreadProxy::StartScrollbarAnimationOnImplThread() { | |
| 1366 layer_tree_host_impl_->StartScrollbarAnimation( | |
| 1367 layer_tree_host_impl_->CurrentFrameTimeTicks()); | |
| 1368 } | |
| 1369 | |
| 1370 void ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread( | 1314 void ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread( |
| 1371 base::TimeTicks frame_time) { | 1315 base::TimeTicks frame_time) { |
| 1372 if (begin_frame_scheduling_enabled_) { | 1316 if (begin_frame_scheduling_enabled_) { |
| 1373 TRACE_EVENT0("cc", | 1317 TRACE_EVENT0("cc", |
| 1374 "ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread"); | 1318 "ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread"); |
| 1375 BeginFrameOnImplThread(frame_time); | 1319 BeginFrameOnImplThread(frame_time); |
| 1376 } | 1320 } |
| 1377 } | 1321 } |
| 1378 | 1322 |
| 1323 void ThreadProxy::StartScrollbarAnimationOnImplThread() { | |
|
brianderson
2013/06/01 04:30:29
not sure why i moved this. will put it back.
| |
| 1324 layer_tree_host_impl_->StartScrollbarAnimation( | |
| 1325 layer_tree_host_impl_->CurrentFrameTimeTicks()); | |
| 1326 } | |
| 1327 | |
| 1379 void ThreadProxy::DidActivatePendingTree() { | 1328 void ThreadProxy::DidActivatePendingTree() { |
| 1380 DCHECK(IsImplThread()); | 1329 DCHECK(IsImplThread()); |
| 1381 TRACE_EVENT0("cc", "ThreadProxy::DidActivatePendingTreeOnImplThread"); | 1330 TRACE_EVENT0("cc", "ThreadProxy::DidActivatePendingTreeOnImplThread"); |
| 1382 | 1331 |
| 1383 if (completion_event_for_commit_held_on_tree_activation_ && | 1332 if (completion_event_for_commit_held_on_tree_activation_ && |
| 1384 !layer_tree_host_impl_->pending_tree()) { | 1333 !layer_tree_host_impl_->pending_tree()) { |
| 1385 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", | 1334 TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation", |
| 1386 TRACE_EVENT_SCOPE_THREAD); | 1335 TRACE_EVENT_SCOPE_THREAD); |
| 1387 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); | 1336 DCHECK(layer_tree_host_impl_->settings().impl_side_painting); |
| 1388 completion_event_for_commit_held_on_tree_activation_->Signal(); | 1337 completion_event_for_commit_held_on_tree_activation_->Signal(); |
| 1389 completion_event_for_commit_held_on_tree_activation_ = NULL; | 1338 completion_event_for_commit_held_on_tree_activation_ = NULL; |
| 1390 } | 1339 } |
| 1391 } | 1340 } |
| 1392 | 1341 |
| 1393 } // namespace cc | 1342 } // namespace cc |
| OLD | NEW |