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 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
681 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); | 681 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); |
682 | 682 |
683 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); | 683 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); |
684 | 684 |
685 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); | 685 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); |
686 | 686 |
687 GetContentClient()->renderer()->RenderThreadStarted(); | 687 GetContentClient()->renderer()->RenderThreadStarted(); |
688 | 688 |
689 InitSkiaEventTracer(); | 689 InitSkiaEventTracer(); |
690 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 690 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
691 skia::SkiaMemoryDumpProvider::GetInstance()); | 691 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia", nullptr); |
692 | 692 |
693 const base::CommandLine& command_line = | 693 const base::CommandLine& command_line = |
694 *base::CommandLine::ForCurrentProcess(); | 694 *base::CommandLine::ForCurrentProcess(); |
695 | 695 |
696 cc::LayerSettings layer_settings; | 696 cc::LayerSettings layer_settings; |
697 if (command_line.HasSwitch(switches::kEnableCompositorAnimationTimelines)) | 697 if (command_line.HasSwitch(switches::kEnableCompositorAnimationTimelines)) |
698 layer_settings.use_compositor_animation_timelines = true; | 698 layer_settings.use_compositor_animation_timelines = true; |
699 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); | 699 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); |
700 cc::SetClientNameForMetrics("Renderer"); | 700 cc::SetClientNameForMetrics("Renderer"); |
701 | 701 |
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2001 } | 2001 } |
2002 | 2002 |
2003 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2003 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
2004 size_t erased = | 2004 size_t erased = |
2005 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2005 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
2006 routing_id_); | 2006 routing_id_); |
2007 DCHECK_EQ(1u, erased); | 2007 DCHECK_EQ(1u, erased); |
2008 } | 2008 } |
2009 | 2009 |
2010 } // namespace content | 2010 } // namespace content |
OLD | NEW |