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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 if (command_line.HasSwitch(switches::kDisableDistanceFieldText)) { | 629 if (command_line.HasSwitch(switches::kDisableDistanceFieldText)) { |
630 is_distance_field_text_enabled_ = false; | 630 is_distance_field_text_enabled_ = false; |
631 } else if (command_line.HasSwitch(switches::kEnableDistanceFieldText)) { | 631 } else if (command_line.HasSwitch(switches::kEnableDistanceFieldText)) { |
632 is_distance_field_text_enabled_ = true; | 632 is_distance_field_text_enabled_ = true; |
633 } else { | 633 } else { |
634 is_distance_field_text_enabled_ = false; | 634 is_distance_field_text_enabled_ = false; |
635 } | 635 } |
636 | 636 |
637 // Note that under Linux, the media library will normally already have | 637 // Note that under Linux, the media library will normally already have |
638 // been initialized by the Zygote before this instance became a Renderer. | 638 // been initialized by the Zygote before this instance became a Renderer. |
639 base::FilePath media_path; | 639 media::InitializeMediaLibrary(); |
640 PathService::Get(DIR_MEDIA_LIBS, &media_path); | |
641 if (!media_path.empty()) | |
642 media::InitializeMediaLibrary(media_path); | |
643 | 640 |
644 memory_pressure_listener_.reset(new base::MemoryPressureListener( | 641 memory_pressure_listener_.reset(new base::MemoryPressureListener( |
645 base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)))); | 642 base::Bind(&RenderThreadImpl::OnMemoryPressure, base::Unretained(this)))); |
646 | 643 |
647 compositor_task_graph_runner_.reset(new cc::TaskGraphRunner); | 644 compositor_task_graph_runner_.reset(new cc::TaskGraphRunner); |
648 | 645 |
649 is_gather_pixel_refs_enabled_ = false; | 646 is_gather_pixel_refs_enabled_ = false; |
650 | 647 |
651 if (is_impl_side_painting_enabled_) { | 648 if (is_impl_side_painting_enabled_) { |
652 int num_raster_threads = 0; | 649 int num_raster_threads = 0; |
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1091 | 1088 |
1092 compositor_message_filter_ = new CompositorForwardingMessageFilter( | 1089 compositor_message_filter_ = new CompositorForwardingMessageFilter( |
1093 compositor_impl_side_loop.get()); | 1090 compositor_impl_side_loop.get()); |
1094 AddFilter(compositor_message_filter_.get()); | 1091 AddFilter(compositor_message_filter_.get()); |
1095 | 1092 |
1096 RenderThreadImpl::RegisterSchemes(); | 1093 RenderThreadImpl::RegisterSchemes(); |
1097 | 1094 |
1098 EnableBlinkPlatformLogChannels( | 1095 EnableBlinkPlatformLogChannels( |
1099 command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); | 1096 command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); |
1100 | 1097 |
1101 if (!media::IsMediaLibraryInitialized()) { | |
1102 WebRuntimeFeatures::enableWebAudio(false); | |
1103 } | |
1104 | |
1105 RenderMediaClient::Initialize(); | 1098 RenderMediaClient::Initialize(); |
1106 | 1099 |
1107 FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); | 1100 FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized()); |
1108 | 1101 |
1109 devtools_agent_message_filter_ = new DevToolsAgentFilter(); | 1102 devtools_agent_message_filter_ = new DevToolsAgentFilter(); |
1110 AddFilter(devtools_agent_message_filter_.get()); | 1103 AddFilter(devtools_agent_message_filter_.get()); |
1111 | 1104 |
1112 v8_sampling_profiler_.reset(new V8SamplingProfiler()); | 1105 v8_sampling_profiler_.reset(new V8SamplingProfiler()); |
1113 | 1106 |
1114 if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) | 1107 if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) |
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1885 } | 1878 } |
1886 | 1879 |
1887 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1880 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1888 size_t erased = | 1881 size_t erased = |
1889 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1882 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1890 routing_id_); | 1883 routing_id_); |
1891 DCHECK_EQ(1u, erased); | 1884 DCHECK_EQ(1u, erased); |
1892 } | 1885 } |
1893 | 1886 |
1894 } // namespace content | 1887 } // namespace content |
OLD | NEW |