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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
640 if (command_line.HasSwitch(switches::kDisableDistanceFieldText)) { | 640 if (command_line.HasSwitch(switches::kDisableDistanceFieldText)) { |
641 is_distance_field_text_enabled_ = false; | 641 is_distance_field_text_enabled_ = false; |
642 } else if (command_line.HasSwitch(switches::kEnableDistanceFieldText)) { | 642 } else if (command_line.HasSwitch(switches::kEnableDistanceFieldText)) { |
643 is_distance_field_text_enabled_ = true; | 643 is_distance_field_text_enabled_ = true; |
644 } else { | 644 } else { |
645 is_distance_field_text_enabled_ = false; | 645 is_distance_field_text_enabled_ = false; |
646 } | 646 } |
647 | 647 |
648 // Note that under Linux, the media library will normally already have | 648 // Note that under Linux, the media library will normally already have |
649 // been initialized by the Zygote before this instance became a Renderer. | 649 // been initialized by the Zygote before this instance became a Renderer. |
650 base::FilePath media_path; | 650 media::InitializeMediaLibrary(); |
651 PathService::Get(DIR_MEDIA_LIBS, &media_path); | |
652 if (!media_path.empty()) | |
653 media::InitializeMediaLibrary(media_path); | |
654 | 651 |
655 memory_pressure_listener_.reset(new base::MemoryPressureListener( | 652 memory_pressure_listener_.reset(new base::MemoryPressureListener( |
656 base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)))); | 653 base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)))); |
657 | 654 |
658 compositor_task_graph_runner_.reset(new cc::TaskGraphRunner); | 655 compositor_task_graph_runner_.reset(new cc::TaskGraphRunner); |
659 | 656 |
660 is_gather_pixel_refs_enabled_ = false; | 657 is_gather_pixel_refs_enabled_ = false; |
661 | 658 |
662 if (is_impl_side_painting_enabled_) { | 659 if (is_impl_side_painting_enabled_) { |
663 int num_raster_threads = 0; | 660 int num_raster_threads = 0; |
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1100 | 1097 |
1101 compositor_message_filter_ = new CompositorForwardingMessageFilter( | 1098 compositor_message_filter_ = new CompositorForwardingMessageFilter( |
1102 compositor_impl_side_task_runner.get()); | 1099 compositor_impl_side_task_runner.get()); |
1103 AddFilter(compositor_message_filter_.get()); | 1100 AddFilter(compositor_message_filter_.get()); |
1104 | 1101 |
1105 RenderThreadImpl::RegisterSchemes(); | 1102 RenderThreadImpl::RegisterSchemes(); |
1106 | 1103 |
1107 EnableBlinkPlatformLogChannels( | 1104 EnableBlinkPlatformLogChannels( |
1108 command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); | 1105 command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); |
1109 | 1106 |
1110 if (!media::IsMediaLibraryInitialized()) { | |
1111 WebRuntimeFeatures::enableWebAudio(false); | |
1112 } | |
1113 | |
1114 RenderMediaClient::Initialize(); | 1107 RenderMediaClient::Initialize(); |
1115 | 1108 |
1116 FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); | 1109 FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); |
1117 | 1110 |
1118 devtools_agent_message_filter_ = new DevToolsAgentFilter(); | 1111 devtools_agent_message_filter_ = new DevToolsAgentFilter(); |
1119 AddFilter(devtools_agent_message_filter_.get()); | 1112 AddFilter(devtools_agent_message_filter_.get()); |
1120 | 1113 |
1121 v8_sampling_profiler_.reset(new V8SamplingProfiler()); | 1114 v8_sampling_profiler_.reset(new V8SamplingProfiler()); |
1122 | 1115 |
1123 if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) | 1116 if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1899 } | 1892 } |
1900 | 1893 |
1901 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1894 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1902 size_t erased = | 1895 size_t erased = |
1903 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1896 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1904 routing_id_); | 1897 routing_id_); |
1905 DCHECK_EQ(1u, erased); | 1898 DCHECK_EQ(1u, erased); |
1906 } | 1899 } |
1907 | 1900 |
1908 } // namespace content | 1901 } // namespace content |
OLD | NEW |