compositor-worker: Refactor CompositorWorkerManager

content/renderer/render_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 21 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "cc/base/histograms.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_external_bitmap_impl.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/layer_settings.h"
 #include "cc/raster/task_graph_runner.h"
+#include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_settings.h"
+#include "components/scheduler/child/webthread_base.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "content/child/appcache/appcache_dispatcher.h"
 #include "content/child/appcache/appcache_frontend_impl.h"
 #include "content/child/child_discardable_shared_memory_manager.h"
 #include "content/child/child_gpu_memory_buffer_manager.h"
 #include "content/child/child_histogram_message_filter.h"
 #include "content/child/child_resource_message_filter.h"
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/child/content_child_helpers.h"
 #include "content/child/db_message_filter.h"
@@ skipping 77 matching lines @@
 #include "media/base/media.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/port_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "skia/ext/event_tracer_impl.h"
 #include "skia/ext/skia_memory_dump_provider.h"
+#include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebImageGenerator.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebThread.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebDatabase.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebImageCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
@@ skipping 929 matching lines @@
     bool using_ipc_sync_compositing =
         base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kIPCSyncCompositing);
     DCHECK(!sync_compositor_factory || !using_ipc_sync_compositing);
 
     if (sync_compositor_factory) {
       compositor_task_runner_ =
           sync_compositor_factory->GetCompositorTaskRunner();
     }
 #endif
-    if (!compositor_task_runner_) {
-      compositor_thread_.reset(new base::Thread("Compositor"));
-      base::Thread::Options compositor_thread_options;
-#if defined(OS_ANDROID)
-      compositor_thread_options.priority = base::ThreadPriority::DISPLAY;
-#endif
-      compositor_thread_->StartWithOptions(compositor_thread_options);
-      compositor_task_runner_ = compositor_thread_->task_runner();
+    if (!compositor_task_runner_.get()) {
+      compositor_thread_.reset(
+          blink::Platform::current()->createThreadForCompositor("Compositor"));

[sadrul, 2015/11/27 19:03:08]

This can directly call into BlinkPlatformImpl through blink_platform_impl(),
instead of going through blink::Platform, so blink::Platform doesn't need to
grow.

[Ian Vollick, 2015/11/27 19:56:11]

Done.

+      compositor_task_runner_ = static_cast<scheduler::WebThreadBase*>(
+          compositor_thread_.get())->TaskRunner();
       compositor_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(base::IgnoreResult(&ThreadRestrictions::SetIOAllowed),
                      false));
     }
 
     InputHandlerManagerClient* input_handler_manager_client = NULL;
 #if defined(OS_ANDROID)
     if (using_ipc_sync_compositing) {
       sync_compositor_message_filter_ =
@@ skipping 866 matching lines @@
 
 void RenderThreadImpl::ReleaseFreeMemory() {
   base::allocator::ReleaseFreeMemory();
   discardable_shared_memory_manager()->ReleaseFreeMemory();
 
   if (blink_platform_impl_)
     blink::decommitFreeableMemory();
 }
 
 }  // namespace content