OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 TRACE_EVENT_END_ETW("RenderThreadImpl::Init", 0, ""); | 426 TRACE_EVENT_END_ETW("RenderThreadImpl::Init", 0, ""); |
427 } | 427 } |
428 | 428 |
429 RenderThreadImpl::~RenderThreadImpl() { | 429 RenderThreadImpl::~RenderThreadImpl() { |
430 } | 430 } |
431 | 431 |
432 void RenderThreadImpl::Shutdown() { | 432 void RenderThreadImpl::Shutdown() { |
433 FOR_EACH_OBSERVER( | 433 FOR_EACH_OBSERVER( |
434 RenderProcessObserver, observers_, OnRenderProcessShutdown()); | 434 RenderProcessObserver, observers_, OnRenderProcessShutdown()); |
435 | 435 |
| 436 ChildThread::Shutdown(); |
| 437 |
436 // Wait for all databases to be closed. | 438 // Wait for all databases to be closed. |
437 if (web_database_observer_impl_) | 439 if (web_database_observer_impl_) |
438 web_database_observer_impl_->WaitForAllDatabasesToClose(); | 440 web_database_observer_impl_->WaitForAllDatabasesToClose(); |
439 | 441 |
440 // Shutdown in reverse of the initialization order. | 442 // Shutdown in reverse of the initialization order. |
441 if (devtools_agent_message_filter_.get()) { | 443 if (devtools_agent_message_filter_.get()) { |
442 RemoveFilter(devtools_agent_message_filter_.get()); | 444 RemoveFilter(devtools_agent_message_filter_.get()); |
443 devtools_agent_message_filter_ = NULL; | 445 devtools_agent_message_filter_ = NULL; |
444 } | 446 } |
445 | 447 |
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 | 1307 |
1306 void RenderThreadImpl::SetFlingCurveParameters( | 1308 void RenderThreadImpl::SetFlingCurveParameters( |
1307 const std::vector<float>& new_touchpad, | 1309 const std::vector<float>& new_touchpad, |
1308 const std::vector<float>& new_touchscreen) { | 1310 const std::vector<float>& new_touchscreen) { |
1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1311 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1310 new_touchscreen); | 1312 new_touchscreen); |
1311 | 1313 |
1312 } | 1314 } |
1313 | 1315 |
1314 } // namespace content | 1316 } // namespace content |
OLD | NEW |