Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 531bed3dc8e13b30b4ae542d0cb2ee4ebcba0b22..e5b02417221d52006be60e31bc30d0c2f07fd788 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -90,6 +90,7 @@ |
#include "content/renderer/browser_plugin/browser_plugin_manager.h" |
#include "content/renderer/cache_storage/cache_storage_dispatcher.h" |
#include "content/renderer/cache_storage/cache_storage_message_filter.h" |
+#include "content/renderer/categorized_worker_pool.h" |
#include "content/renderer/devtools/devtools_agent_filter.h" |
#include "content/renderer/devtools/v8_sampling_profiler.h" |
#include "content/renderer/dom_storage/dom_storage_dispatcher.h" |
@@ -113,7 +114,6 @@ |
#include "content/renderer/media/video_capture_message_filter.h" |
#include "content/renderer/net_info_helper.h" |
#include "content/renderer/p2p/socket_dispatcher.h" |
-#include "content/renderer/raster_worker_pool.h" |
#include "content/renderer/render_frame_proxy.h" |
#include "content/renderer/render_process_impl.h" |
#include "content/renderer/render_view_impl.h" |
@@ -581,9 +581,11 @@ RenderThreadImpl::RenderThreadImpl( |
std::unique_ptr<scheduler::RendererScheduler> scheduler, |
scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue) |
: ChildThreadImpl(Options::Builder() |
- .InBrowserProcess(params).UseMojoChannel(true).Build()), |
+ .InBrowserProcess(params) |
+ .UseMojoChannel(true) |
+ .Build()), |
renderer_scheduler_(std::move(scheduler)), |
- raster_worker_pool_(new RasterWorkerPool()) { |
+ categorized_worker_pool_(new CategorizedWorkerPool()) { |
Init(resource_task_queue); |
} |
@@ -595,7 +597,7 @@ RenderThreadImpl::RenderThreadImpl( |
: ChildThreadImpl(Options::Builder().UseMojoChannel(true).Build()), |
renderer_scheduler_(std::move(scheduler)), |
main_message_loop_(std::move(main_message_loop)), |
- raster_worker_pool_(new RasterWorkerPool()) { |
+ categorized_worker_pool_(new CategorizedWorkerPool()) { |
scoped_refptr<base::SingleThreadTaskRunner> test_task_counter; |
Init(test_task_counter); |
} |
@@ -796,7 +798,7 @@ void RenderThreadImpl::Init( |
// image decode tasks. |
are_image_decode_tasks_enabled_ = true; |
- raster_worker_pool_->Start(num_raster_threads); |
+ categorized_worker_pool_->Start(num_raster_threads); |
// TODO(boliu): In single process, browser main loop should set up the |
// discardable memory manager, and should skip this if kSingleProcess. |
@@ -892,7 +894,7 @@ void RenderThreadImpl::Shutdown() { |
RemoveFilter(audio_message_filter_.get()); |
audio_message_filter_ = NULL; |
- raster_worker_pool_->Shutdown(); |
+ categorized_worker_pool_->Shutdown(); |
main_input_callback_.Cancel(); |
input_handler_manager_.reset(); |
@@ -1612,7 +1614,7 @@ RenderThreadImpl::GetImageSerializationProcessor() { |
} |
cc::TaskGraphRunner* RenderThreadImpl::GetTaskGraphRunner() { |
- return raster_worker_pool_->GetTaskGraphRunner(); |
+ return categorized_worker_pool_->GetTaskGraphRunner(); |
} |
bool RenderThreadImpl::AreImageDecodeTasksEnabled() { |
@@ -1941,7 +1943,7 @@ RenderThreadImpl::GetMediaThreadTaskRunner() { |
} |
base::TaskRunner* RenderThreadImpl::GetWorkerTaskRunner() { |
- return raster_worker_pool_.get(); |
+ return categorized_worker_pool_.get(); |
} |
scoped_refptr<ContextProviderCommandBuffer> |