| 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/ppapi_plugin/ppapi_thread.h" | 5 #include "content/ppapi_plugin/ppapi_thread.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 PpapiThread::~PpapiThread() { | 138 PpapiThread::~PpapiThread() { |
| 139 } | 139 } |
| 140 | 140 |
| 141 void PpapiThread::Shutdown() { | 141 void PpapiThread::Shutdown() { |
| 142 ChildThreadImpl::Shutdown(); | 142 ChildThreadImpl::Shutdown(); |
| 143 | 143 |
| 144 ppapi::proxy::PluginGlobals::Get()->ResetPluginProxyDelegate(); | 144 ppapi::proxy::PluginGlobals::Get()->ResetPluginProxyDelegate(); |
| 145 if (plugin_entry_points_.shutdown_module) | 145 if (plugin_entry_points_.shutdown_module) |
| 146 plugin_entry_points_.shutdown_module(); | 146 plugin_entry_points_.shutdown_module(); |
| 147 blink_platform_impl_->Shutdown(); | 147 blink_platform_impl_->Shutdown(); |
| 148 blink::Platform::shutdown(); | |
| 149 } | 148 } |
| 150 | 149 |
| 151 bool PpapiThread::Send(IPC::Message* msg) { | 150 bool PpapiThread::Send(IPC::Message* msg) { |
| 152 // Allow access from multiple threads. | 151 // Allow access from multiple threads. |
| 153 if (message_loop()->task_runner()->BelongsToCurrentThread()) | 152 if (message_loop()->task_runner()->BelongsToCurrentThread()) |
| 154 return ChildThreadImpl::Send(msg); | 153 return ChildThreadImpl::Send(msg); |
| 155 | 154 |
| 156 return sync_message_filter()->Send(msg); | 155 return sync_message_filter()->Send(msg); |
| 157 } | 156 } |
| 158 | 157 |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 GetHistogramName(is_broker_, "LoadTime", path), | 587 GetHistogramName(is_broker_, "LoadTime", path), |
| 589 base::TimeDelta::FromMilliseconds(1), | 588 base::TimeDelta::FromMilliseconds(1), |
| 590 base::TimeDelta::FromSeconds(10), | 589 base::TimeDelta::FromSeconds(10), |
| 591 50, | 590 50, |
| 592 base::HistogramBase::kUmaTargetedHistogramFlag); | 591 base::HistogramBase::kUmaTargetedHistogramFlag); |
| 593 | 592 |
| 594 histogram->AddTime(load_time); | 593 histogram->AddTime(load_time); |
| 595 } | 594 } |
| 596 | 595 |
| 597 } // namespace content | 596 } // namespace content |
| OLD | NEW |