Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/renderer/render_thread.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 19 matching lines...) Expand all Loading... | |
| 30 #include "content/common/npobject_util.h" | 30 #include "content/common/npobject_util.h" |
| 31 #include "content/common/plugin_messages.h" | 31 #include "content/common/plugin_messages.h" |
| 32 #include "content/common/renderer_preferences.h" | 32 #include "content/common/renderer_preferences.h" |
| 33 #include "content/common/resource_messages.h" | 33 #include "content/common/resource_messages.h" |
| 34 #include "content/common/view_messages.h" | 34 #include "content/common/view_messages.h" |
| 35 #include "content/common/web_database_observer_impl.h" | 35 #include "content/common/web_database_observer_impl.h" |
| 36 #include "content/public/renderer/content_renderer_client.h" | 36 #include "content/public/renderer/content_renderer_client.h" |
| 37 #include "content/public/renderer/render_process_observer.h" | 37 #include "content/public/renderer/render_process_observer.h" |
| 38 #include "content/public/renderer/render_view_visitor.h" | 38 #include "content/public/renderer/render_view_visitor.h" |
| 39 #include "content/renderer/devtools_agent_filter.h" | 39 #include "content/renderer/devtools_agent_filter.h" |
| 40 #include "content/renderer/gpu/compositor_thread.h" | |
| 40 #include "content/renderer/gpu/gpu_channel_host.h" | 41 #include "content/renderer/gpu/gpu_channel_host.h" |
| 41 #include "content/renderer/indexed_db_dispatcher.h" | 42 #include "content/renderer/indexed_db_dispatcher.h" |
| 42 #include "content/renderer/media/audio_input_message_filter.h" | 43 #include "content/renderer/media/audio_input_message_filter.h" |
| 43 #include "content/renderer/media/audio_message_filter.h" | 44 #include "content/renderer/media/audio_message_filter.h" |
| 44 #include "content/renderer/media/video_capture_impl_manager.h" | 45 #include "content/renderer/media/video_capture_impl_manager.h" |
| 45 #include "content/renderer/media/video_capture_message_filter.h" | 46 #include "content/renderer/media/video_capture_message_filter.h" |
| 46 #include "content/renderer/plugin_channel_host.h" | 47 #include "content/renderer/plugin_channel_host.h" |
| 47 #include "content/renderer/render_process_impl.h" | 48 #include "content/renderer/render_process_impl.h" |
| 48 #include "content/renderer/render_view.h" | 49 #include "content/renderer/render_view.h" |
| 49 #include "content/renderer/renderer_webidbfactory_impl.h" | 50 #include "content/renderer/renderer_webidbfactory_impl.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 232 | 233 |
| 233 RemoveFilter(vc_manager_->video_capture_message_filter()); | 234 RemoveFilter(vc_manager_->video_capture_message_filter()); |
| 234 | 235 |
| 235 RemoveFilter(db_message_filter_.get()); | 236 RemoveFilter(db_message_filter_.get()); |
| 236 db_message_filter_ = NULL; | 237 db_message_filter_ = NULL; |
| 237 | 238 |
| 238 // Shutdown the file thread if it's running. | 239 // Shutdown the file thread if it's running. |
| 239 if (file_thread_.get()) | 240 if (file_thread_.get()) |
| 240 file_thread_->Stop(); | 241 file_thread_->Stop(); |
| 241 | 242 |
| 243 if (compositor_thread_.get()) { | |
| 244 RemoveFilter(compositor_thread_->GetMessageFilter()); | |
| 245 compositor_thread_.reset(); | |
| 246 } | |
| 247 | |
| 242 if (webkit_platform_support_.get()) | 248 if (webkit_platform_support_.get()) |
| 243 WebKit::shutdown(); | 249 WebKit::shutdown(); |
| 244 | 250 |
| 245 lazy_tls.Pointer()->Set(NULL); | 251 lazy_tls.Pointer()->Set(NULL); |
| 246 | 252 |
| 247 // TODO(port) | 253 // TODO(port) |
| 248 #if defined(OS_WIN) | 254 #if defined(OS_WIN) |
| 249 // Clean up plugin channels before this thread goes away. | 255 // Clean up plugin channels before this thread goes away. |
| 250 NPChannelBase::CleanupChannels(); | 256 NPChannelBase::CleanupChannels(); |
| 251 // Don't call COM if the renderer is in the sandbox. | 257 // Don't call COM if the renderer is in the sandbox. |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 432 if (webkit_platform_support_.get()) | 438 if (webkit_platform_support_.get()) |
| 433 return; | 439 return; |
| 434 | 440 |
| 435 v8::V8::SetCounterFunction(base::StatsTable::FindLocation); | 441 v8::V8::SetCounterFunction(base::StatsTable::FindLocation); |
| 436 v8::V8::SetCreateHistogramFunction(CreateHistogram); | 442 v8::V8::SetCreateHistogramFunction(CreateHistogram); |
| 437 v8::V8::SetAddHistogramSampleFunction(AddHistogramSample); | 443 v8::V8::SetAddHistogramSampleFunction(AddHistogramSample); |
| 438 | 444 |
| 439 webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); | 445 webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); |
| 440 WebKit::initialize(webkit_platform_support_.get()); | 446 WebKit::initialize(webkit_platform_support_.get()); |
| 441 | 447 |
| 448 compositor_thread_.reset(new CompositorThread(this)); | |
| 449 AddFilter(compositor_thread_->GetMessageFilter()); | |
|
jam
2011/10/05 21:41:49
nit: I'm curious why you chose to make RenderThrea
| |
| 450 | |
| 442 WebScriptController::enableV8SingleThreadMode(); | 451 WebScriptController::enableV8SingleThreadMode(); |
| 443 | 452 |
| 444 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 453 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 445 | 454 |
| 446 webkit_glue::EnableWebCoreLogChannels( | 455 webkit_glue::EnableWebCoreLogChannels( |
| 447 command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels)); | 456 command_line.GetSwitchValueASCII(switches::kWebCoreLogChannels)); |
| 448 | 457 |
| 449 if (command_line.HasSwitch(switches::kPlaybackMode) || | 458 if (command_line.HasSwitch(switches::kPlaybackMode) || |
| 450 command_line.HasSwitch(switches::kRecordMode) || | 459 command_line.HasSwitch(switches::kRecordMode) || |
| 451 command_line.HasSwitch(switches::kNoJsRandomness)) { | 460 command_line.HasSwitch(switches::kNoJsRandomness)) { |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 725 | 734 |
| 726 void RenderThread::RegisterExtension(v8::Extension* extension) { | 735 void RenderThread::RegisterExtension(v8::Extension* extension) { |
| 727 WebScriptController::registerExtension(extension); | 736 WebScriptController::registerExtension(extension); |
| 728 v8_extensions_.insert(extension->name()); | 737 v8_extensions_.insert(extension->name()); |
| 729 } | 738 } |
| 730 | 739 |
| 731 bool RenderThread::IsRegisteredExtension( | 740 bool RenderThread::IsRegisteredExtension( |
| 732 const std::string& v8_extension_name) const { | 741 const std::string& v8_extension_name) const { |
| 733 return v8_extensions_.find(v8_extension_name) != v8_extensions_.end(); | 742 return v8_extensions_.find(v8_extension_name) != v8_extensions_.end(); |
| 734 } | 743 } |
| OLD | NEW |