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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 #include "content/public/common/content_switches.h" | 66 #include "content/public/common/content_switches.h" |
67 #include "content/public/common/renderer_preferences.h" | 67 #include "content/public/common/renderer_preferences.h" |
68 #include "content/public/common/url_constants.h" | 68 #include "content/public/common/url_constants.h" |
69 #include "content/public/renderer/content_renderer_client.h" | 69 #include "content/public/renderer/content_renderer_client.h" |
70 #include "content/public/renderer/render_process_observer.h" | 70 #include "content/public/renderer/render_process_observer.h" |
71 #include "content/public/renderer/render_view_visitor.h" | 71 #include "content/public/renderer/render_view_visitor.h" |
72 #include "content/renderer/devtools/devtools_agent_filter.h" | 72 #include "content/renderer/devtools/devtools_agent_filter.h" |
73 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" | 73 #include "content/renderer/dom_storage/dom_storage_dispatcher.h" |
74 #include "content/renderer/dom_storage/webstoragearea_impl.h" | 74 #include "content/renderer/dom_storage/webstoragearea_impl.h" |
75 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 75 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
| 76 #include "content/renderer/gpu/compositor_external_begin_frame_source.h" |
| 77 #include "content/renderer/gpu/compositor_ipc_message_filter.h" |
76 #include "content/renderer/gpu/compositor_output_surface.h" | 78 #include "content/renderer/gpu/compositor_output_surface.h" |
77 #include "content/renderer/gpu/gpu_benchmarking_extension.h" | 79 #include "content/renderer/gpu/gpu_benchmarking_extension.h" |
78 #include "content/renderer/input/input_event_filter.h" | 80 #include "content/renderer/input/input_event_filter.h" |
79 #include "content/renderer/input/input_handler_manager.h" | 81 #include "content/renderer/input/input_handler_manager.h" |
80 #include "content/renderer/media/aec_dump_message_filter.h" | 82 #include "content/renderer/media/aec_dump_message_filter.h" |
81 #include "content/renderer/media/audio_input_message_filter.h" | 83 #include "content/renderer/media/audio_input_message_filter.h" |
82 #include "content/renderer/media/audio_message_filter.h" | 84 #include "content/renderer/media/audio_message_filter.h" |
83 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 85 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
84 #include "content/renderer/media/media_stream_center.h" | 86 #include "content/renderer/media/media_stream_center.h" |
85 #include "content/renderer/media/midi_message_filter.h" | 87 #include "content/renderer/media/midi_message_filter.h" |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 RemoveFilter(vc_manager_->video_capture_message_filter()); | 624 RemoveFilter(vc_manager_->video_capture_message_filter()); |
623 vc_manager_.reset(); | 625 vc_manager_.reset(); |
624 | 626 |
625 RemoveFilter(db_message_filter_.get()); | 627 RemoveFilter(db_message_filter_.get()); |
626 db_message_filter_ = NULL; | 628 db_message_filter_ = NULL; |
627 | 629 |
628 // Shutdown the file thread if it's running. | 630 // Shutdown the file thread if it's running. |
629 if (file_thread_) | 631 if (file_thread_) |
630 file_thread_->Stop(); | 632 file_thread_->Stop(); |
631 | 633 |
632 if (compositor_output_surface_filter_.get()) { | 634 if (compositor_message_filter_.get()) { |
633 RemoveFilter(compositor_output_surface_filter_.get()); | 635 RemoveFilter(compositor_message_filter_.get()); |
634 compositor_output_surface_filter_ = NULL; | 636 compositor_message_filter_ = NULL; |
635 } | 637 } |
636 | 638 |
637 media_thread_.reset(); | 639 media_thread_.reset(); |
638 | 640 |
639 // AudioMessageFilter may be accessed on |media_thread_|, so shutdown after. | 641 // AudioMessageFilter may be accessed on |media_thread_|, so shutdown after. |
640 RemoveFilter(audio_message_filter_.get()); | 642 RemoveFilter(audio_message_filter_.get()); |
641 audio_message_filter_ = NULL; | 643 audio_message_filter_ = NULL; |
642 | 644 |
643 compositor_thread_.reset(); | 645 compositor_thread_.reset(); |
644 input_handler_manager_.reset(); | 646 input_handler_manager_.reset(); |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
892 main_thread_compositor_task_runner_, | 894 main_thread_compositor_task_runner_, |
893 compositor_message_loop_proxy_); | 895 compositor_message_loop_proxy_); |
894 AddFilter(input_event_filter_.get()); | 896 AddFilter(input_event_filter_.get()); |
895 input_handler_manager_client = input_event_filter_.get(); | 897 input_handler_manager_client = input_event_filter_.get(); |
896 } | 898 } |
897 input_handler_manager_.reset( | 899 input_handler_manager_.reset( |
898 new InputHandlerManager(compositor_message_loop_proxy_, | 900 new InputHandlerManager(compositor_message_loop_proxy_, |
899 input_handler_manager_client)); | 901 input_handler_manager_client)); |
900 } | 902 } |
901 | 903 |
902 scoped_refptr<base::MessageLoopProxy> output_surface_loop; | 904 scoped_refptr<base::MessageLoopProxy> compositor_impl_side_loop; |
903 if (enable) | 905 if (enable) |
904 output_surface_loop = compositor_message_loop_proxy_; | 906 compositor_impl_side_loop = compositor_message_loop_proxy_; |
905 else | 907 else |
906 output_surface_loop = base::MessageLoopProxy::current(); | 908 compositor_impl_side_loop = base::MessageLoopProxy::current(); |
907 | 909 |
908 compositor_output_surface_filter_ = | 910 compositor_message_filter_ = CreateCompositorIPCMessageFilter( |
909 CompositorOutputSurface::CreateFilter(output_surface_loop.get()); | 911 compositor_impl_side_loop.get()); |
910 AddFilter(compositor_output_surface_filter_.get()); | 912 AddFilter(compositor_message_filter_.get()); |
911 | 913 |
912 RenderThreadImpl::RegisterSchemes(); | 914 RenderThreadImpl::RegisterSchemes(); |
913 | 915 |
914 EnableBlinkPlatformLogChannels( | 916 EnableBlinkPlatformLogChannels( |
915 command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); | 917 command_line.GetSwitchValueASCII(switches::kBlinkPlatformLogChannels)); |
916 | 918 |
917 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); | 919 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); |
918 | 920 |
919 if (!media::IsMediaLibraryInitialized()) { | 921 if (!media::IsMediaLibraryInitialized()) { |
920 WebRuntimeFeatures::enableWebAudio(false); | 922 WebRuntimeFeatures::enableWebAudio(false); |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1587 hidden_widget_count_--; | 1589 hidden_widget_count_--; |
1588 | 1590 |
1589 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1591 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1590 return; | 1592 return; |
1591 } | 1593 } |
1592 | 1594 |
1593 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1595 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1594 } | 1596 } |
1595 | 1597 |
1596 } // namespace content | 1598 } // namespace content |
OLD | NEW |