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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 GetContentClient()->renderer()->RenderThreadStarted(); | 646 GetContentClient()->renderer()->RenderThreadStarted(); |
647 | 647 |
648 InitSkiaEventTracer(); | 648 InitSkiaEventTracer(); |
649 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 649 base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( |
650 skia::SkiaMemoryDumpProvider::GetInstance()); | 650 skia::SkiaMemoryDumpProvider::GetInstance()); |
651 | 651 |
652 const base::CommandLine& command_line = | 652 const base::CommandLine& command_line = |
653 *base::CommandLine::ForCurrentProcess(); | 653 *base::CommandLine::ForCurrentProcess(); |
654 | 654 |
655 cc::LayerSettings layer_settings; | 655 cc::LayerSettings layer_settings; |
656 layer_settings.use_compositor_animation_timelines = | 656 if (command_line.HasSwitch(switches::kEnableCompositorAnimationTimelines)) |
657 !command_line.HasSwitch(switches::kDisableCompositorAnimationTimelines); | 657 layer_settings.use_compositor_animation_timelines = true; |
658 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); | 658 cc_blink::WebLayerImpl::SetLayerSettings(layer_settings); |
659 cc::SetClientNameForMetrics("Renderer"); | 659 cc::SetClientNameForMetrics("Renderer"); |
660 | 660 |
661 is_threaded_animation_enabled_ = | 661 is_threaded_animation_enabled_ = |
662 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); | 662 !command_line.HasSwitch(cc::switches::kDisableThreadedAnimation); |
663 | 663 |
664 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); | 664 is_zero_copy_enabled_ = command_line.HasSwitch(switches::kEnableZeroCopy); |
665 is_persistent_gpu_memory_buffer_enabled_ = | 665 is_persistent_gpu_memory_buffer_enabled_ = |
666 command_line.HasSwitch(switches::kEnablePersistentGpuMemoryBuffer); | 666 command_line.HasSwitch(switches::kEnablePersistentGpuMemoryBuffer); |
667 | 667 |
(...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1991 } | 1991 } |
1992 | 1992 |
1993 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1993 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1994 size_t erased = | 1994 size_t erased = |
1995 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1995 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1996 routing_id_); | 1996 routing_id_); |
1997 DCHECK_EQ(1u, erased); | 1997 DCHECK_EQ(1u, erased); |
1998 } | 1998 } |
1999 | 1999 |
2000 } // namespace content | 2000 } // namespace content |
OLD | NEW |