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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
547 : ChildThreadImpl(Options::Builder() | 547 : ChildThreadImpl(Options::Builder() |
548 .UseMojoChannel(ShouldUseMojoChannel()) | 548 .UseMojoChannel(ShouldUseMojoChannel()) |
549 .Build()), | 549 .Build()), |
550 renderer_scheduler_(scheduler.Pass()), | 550 renderer_scheduler_(scheduler.Pass()), |
551 main_message_loop_(main_message_loop.Pass()), | 551 main_message_loop_(main_message_loop.Pass()), |
552 raster_worker_pool_(new RasterWorkerPool()) { | 552 raster_worker_pool_(new RasterWorkerPool()) { |
553 Init(); | 553 Init(); |
554 } | 554 } |
555 | 555 |
556 void RenderThreadImpl::Init() { | 556 void RenderThreadImpl::Init() { |
557 TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, ""); | 557 TRACE_EVENT0("startup", "RenderThreadImpl::Init"); |
558 | 558 |
559 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( | 559 base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex( |
560 base::PlatformThread::CurrentId(), | 560 base::PlatformThread::CurrentId(), |
561 kTraceEventRendererMainThreadSortIndex); | 561 kTraceEventRendererMainThreadSortIndex); |
562 | 562 |
563 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 563 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
564 // On Mac and Android, the select popups are rendered by the browser. | 564 // On Mac and Android, the select popups are rendered by the browser. |
565 blink::WebView::setUseExternalPopupMenus(true); | 565 blink::WebView::setUseExternalPopupMenus(true); |
566 #endif | 566 #endif |
567 | 567 |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
754 // TODO(boliu): In single process, browser main loop should set up the | 754 // TODO(boliu): In single process, browser main loop should set up the |
755 // discardable memory manager, and should skip this if kSingleProcess. | 755 // discardable memory manager, and should skip this if kSingleProcess. |
756 // See crbug.com/503724. | 756 // See crbug.com/503724. |
757 base::DiscardableMemoryAllocator::SetInstance( | 757 base::DiscardableMemoryAllocator::SetInstance( |
758 ChildThreadImpl::discardable_shared_memory_manager()); | 758 ChildThreadImpl::discardable_shared_memory_manager()); |
759 | 759 |
760 service_registry()->AddService<RenderFrameSetup>( | 760 service_registry()->AddService<RenderFrameSetup>( |
761 base::Bind(CreateRenderFrameSetup)); | 761 base::Bind(CreateRenderFrameSetup)); |
762 service_registry()->AddService<EmbeddedWorkerSetup>( | 762 service_registry()->AddService<EmbeddedWorkerSetup>( |
763 base::Bind(CreateEmbeddedWorkerSetup)); | 763 base::Bind(CreateEmbeddedWorkerSetup)); |
764 | |
765 TRACE_EVENT_END_ETW("RenderThreadImpl::Init", 0, ""); | |
brucedawson
2015/10/07 19:04:23
Why is this call being removed completely?
fdoray
2015/10/08 15:38:26
TRACE_EVENT0 emits a synchronous event with a star
| |
766 } | 764 } |
767 | 765 |
768 RenderThreadImpl::~RenderThreadImpl() { | 766 RenderThreadImpl::~RenderThreadImpl() { |
769 } | 767 } |
770 | 768 |
771 void RenderThreadImpl::Shutdown() { | 769 void RenderThreadImpl::Shutdown() { |
772 FOR_EACH_OBSERVER( | 770 FOR_EACH_OBSERVER( |
773 RenderProcessObserver, observers_, OnRenderProcessShutdown()); | 771 RenderProcessObserver, observers_, OnRenderProcessShutdown()); |
774 | 772 |
775 ChildThreadImpl::Shutdown(); | 773 ChildThreadImpl::Shutdown(); |
(...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1991 } | 1989 } |
1992 | 1990 |
1993 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1991 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1994 size_t erased = | 1992 size_t erased = |
1995 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1993 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1996 routing_id_); | 1994 routing_id_); |
1997 DCHECK_EQ(1u, erased); | 1995 DCHECK_EQ(1u, erased); |
1998 } | 1996 } |
1999 | 1997 |
2000 } // namespace content | 1998 } // namespace content |
OLD | NEW |