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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); | 637 AddFilter((new IndexedDBMessageFilter(thread_safe_sender()))->GetFilter()); |
638 | 638 |
639 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); | 639 AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter()); |
640 | 640 |
641 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); | 641 AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter()); |
642 | 642 |
643 GetContentClient()->renderer()->RenderThreadStarted(); | 643 GetContentClient()->renderer()->RenderThreadStarted(); |
644 | 644 |
645 InitSkiaEventTracer(); | 645 InitSkiaEventTracer(); |
646 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 646 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
647 skia::SkiaMemoryDumpProvider::GetInstance()); | 647 skia::SkiaMemoryDumpProvider::GetInstance(), "Skia"); |
648 | 648 |
649 const base::CommandLine& command_line = | 649 const base::CommandLine& command_line = |
650 *base::CommandLine::ForCurrentProcess(); | 650 *base::CommandLine::ForCurrentProcess(); |
651 | 651 |
652 cc::LayerSettings layer_settings; | 652 cc::LayerSettings layer_settings; |
653 if (command_line.HasSwitch(switches::kEnableCompositorAnimationTimelines)) | 653 if (command_line.HasSwitch(switches::kEnableCompositorAnimationTimelines)) |
654 layer_settings.use_compositor_animation_timelines = true; | 654 layer_settings.use_compositor_animation_timelines = true; |
655 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); | 655 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); |
656 cc::SetClientNameForMetrics("Renderer"); | 656 cc::SetClientNameForMetrics("Renderer"); |
657 | 657 |
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1965 } | 1965 } |
1966 | 1966 |
1967 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1967 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1968 size_t erased = | 1968 size_t erased = |
1969 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1969 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1970 routing_id_); | 1970 routing_id_); |
1971 DCHECK_EQ(1u, erased); | 1971 DCHECK_EQ(1u, erased); |
1972 } | 1972 } |
1973 | 1973 |
1974 } // namespace content | 1974 } // namespace content |
OLD | NEW |