Chromium Code Reviews| 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 <utility> | 10 #include <utility> |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 627 .Build()), | 627 .Build()), |
| 628 renderer_scheduler_(std::move(scheduler)), | 628 renderer_scheduler_(std::move(scheduler)), |
| 629 main_message_loop_(std::move(main_message_loop)), | 629 main_message_loop_(std::move(main_message_loop)), |
| 630 raster_worker_pool_(new RasterWorkerPool()) { | 630 raster_worker_pool_(new RasterWorkerPool()) { |
| 631 Init(); | 631 Init(); |
| 632 } | 632 } |
| 633 | 633 |
| 634 void RenderThreadImpl::Init() { | 634 void RenderThreadImpl::Init() { |
| 635 TRACE_EVENT0("startup", "RenderThreadImpl::Init"); | 635 TRACE_EVENT0("startup", "RenderThreadImpl::Init"); |
| 636 | 636 |
| 637 base::RemoveActionCallback(action_callback_); | |
|
Ilya Sherman
2016/03/21 08:09:44
Hmm, why is this line needed?
beaudoin
2016/03/23 02:46:42
Copied the pattern from components/metrics/metrics
Ilya Sherman
2016/03/24 05:02:35
The example you gave is not an init function -- it
beaudoin
2016/03/24 21:08:55
It's gone now. :)
| |
| 638 action_callback_ = base::Bind(&RenderThreadImpl::RecordComputedAction, | |
| 639 base::Unretained(this)); | |
| 640 base::AddActionCallback(action_callback_); | |
| 641 | |
| 637 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( | 642 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( |
| 638 base::PlatformThread::CurrentId(), | 643 base::PlatformThread::CurrentId(), |
| 639 kTraceEventRendererMainThreadSortIndex); | 644 kTraceEventRendererMainThreadSortIndex); |
| 640 | 645 |
| 641 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA)) | 646 #if defined(OS_MACOSX) || (defined(OS_ANDROID) && !defined(USE_AURA)) |
| 642 // On Mac and Android Java UI, the select popups are rendered by the browser. | 647 // On Mac and Android Java UI, the select popups are rendered by the browser. |
| 643 blink::WebView::setUseExternalPopupMenus(true); | 648 blink::WebView::setUseExternalPopupMenus(true); |
| 644 #endif | 649 #endif |
| 645 | 650 |
| 646 lazy_tls.Pointer()->Set(this); | 651 lazy_tls.Pointer()->Set(this); |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 846 base::CommandLine::ForCurrentProcess()->HasSwitch( | 851 base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 847 switches::kUseMusInRenderer)) | 852 switches::kUseMusInRenderer)) |
| 848 CreateRenderWidgetWindowTreeClientFactory(); | 853 CreateRenderWidgetWindowTreeClientFactory(); |
| 849 #endif | 854 #endif |
| 850 | 855 |
| 851 service_registry()->ConnectToRemoteService( | 856 service_registry()->ConnectToRemoteService( |
| 852 mojo::GetProxy(&storage_partition_service_)); | 857 mojo::GetProxy(&storage_partition_service_)); |
| 853 } | 858 } |
| 854 | 859 |
| 855 RenderThreadImpl::~RenderThreadImpl() { | 860 RenderThreadImpl::~RenderThreadImpl() { |
| 861 base::RemoveActionCallback(action_callback_); | |
| 856 } | 862 } |
| 857 | 863 |
| 858 void RenderThreadImpl::Shutdown() { | 864 void RenderThreadImpl::Shutdown() { |
| 859 FOR_EACH_OBSERVER( | 865 FOR_EACH_OBSERVER( |
| 860 RenderProcessObserver, observers_, OnRenderProcessShutdown()); | 866 RenderProcessObserver, observers_, OnRenderProcessShutdown()); |
| 861 | 867 |
| 862 if (memory_observer_) { | 868 if (memory_observer_) { |
| 863 message_loop()->RemoveTaskObserver(memory_observer_.get()); | 869 message_loop()->RemoveTaskObserver(memory_observer_.get()); |
| 864 memory_observer_.reset(); | 870 memory_observer_.reset(); |
| 865 } | 871 } |
| (...skipping 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2175 } | 2181 } |
| 2176 | 2182 |
| 2177 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2183 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2178 size_t erased = | 2184 size_t erased = |
| 2179 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2185 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2180 routing_id_); | 2186 routing_id_); |
| 2181 DCHECK_EQ(1u, erased); | 2187 DCHECK_EQ(1u, erased); |
| 2182 } | 2188 } |
| 2183 | 2189 |
| 2184 } // namespace content | 2190 } // namespace content |
| OLD | NEW |