Forward input tasks to the Blink scheduler

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>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "cc/base/switches.h"
 #include "cc/resources/raster_worker_pool.h"
 #include "content/child/appcache/appcache_dispatcher.h"
@@ skipping 66 matching lines @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_forwarding_message_filter.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/media.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "mojo/common/common_type_converters.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "skia/ext/event_tracer_impl.h"
+#include "third_party/WebKit/public/platform/WebScheduler.h"
 #include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebThread.h"
 #include "third_party/WebKit/public/web/WebColorName.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"
 #include "third_party/WebKit/public/web/WebPopupMenu.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
@@ skipping 163 matching lines @@
     frame->BindServiceRegistry(request.PassMessagePipe());
   }
 
   virtual void OnConnectionError() OVERRIDE { delete this; }
 };
 
 void CreateRenderFrameSetup(mojo::InterfaceRequest<RenderFrameSetup> request) {
   mojo::BindToRequest(new RenderFrameSetupImpl(), &request);
 }
 
+class WebThreadTask: public blink::WebThread::Task {
+ public:
+  explicit WebThreadTask(const base::Closure& function)
+      : m_function(function) {}
+  virtual ~WebThreadTask() {}
+
+  virtual void run() OVERRIDE {
+    m_function.Run();
+  }
+
+ private:
+  base::Closure m_function;
+};
+
+class SchedulerCompositorTaskRunner : public cc::MainThreadTaskRunner {
+public:
+  SchedulerCompositorTaskRunner()
+      : scheduler_(blink::WebScheduler::create()) {}
+
+  virtual void PostBeginMainFrameTask(
+      const tracked_objects::Location& from_here, const base::Closure& task,
+      double frame_time, double deadline, double interval) OVERRIDE {
+    scheduler_.postBeginFrameTask(
+        new WebThreadTask(task), frame_time, deadline, interval);
+  }
+
+  virtual bool PostDelayedTask(
+      const tracked_objects::Location& from_here, const base::Closure& task,
+      base::TimeDelta delay) OVERRIDE {
+    DCHECK(delay == base::TimeDelta());
+    scheduler_.postCompositorTask(new WebThreadTask(task));
+    return true;
+  }
+
+ protected:
+   virtual ~SchedulerCompositorTaskRunner () {}
+
+ private:
+  // TODO: Rename to WebSchedulerProxy.
+  blink::WebScheduler scheduler_;
+};
+
+class SchedulerInputTaskRunner : public base::SingleThreadTaskRunner {
+ public:
+  SchedulerInputTaskRunner()
+      : scheduler_(blink::WebScheduler::create()) {}
+
+  virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
+      const base::Closure& task,
+      base::TimeDelta delay) OVERRIDE {
+    DCHECK(delay == base::TimeDelta());
+    scheduler_.postInputTask(new WebThreadTask(task));
+    return true;
+  }
+
+  virtual bool PostNonNestableDelayedTask(
+      const tracked_objects::Location& from_here, const base::Closure& task,
+      base::TimeDelta delay) OVERRIDE {
+    NOTREACHED();
+    return false;
+  }
+
+  virtual bool RunsTasksOnCurrentThread() const OVERRIDE {
+    NOTREACHED();
+    return false;
+  }
+
+ protected:
+  virtual ~SchedulerInputTaskRunner() {}
+
+ private:
+  // TODO: Rename to WebSchedulerProxy.
+  blink::WebScheduler scheduler_;
+};
+
 }  // namespace
 
 RenderThreadImpl::HistogramCustomizer::HistogramCustomizer() {
   custom_histograms_.insert("V8.MemoryExternalFragmentationTotal");
   custom_histograms_.insert("V8.MemoryHeapSampleTotalCommitted");
   custom_histograms_.insert("V8.MemoryHeapSampleTotalUsed");
 }
 
 RenderThreadImpl::HistogramCustomizer::~HistogramCustomizer() {}
 
@@ skipping 480 matching lines @@
     ResourceDispatcherDelegate* delegate) {
   resource_dispatcher()->set_delegate(delegate);
 }
 
 void RenderThreadImpl::EnsureWebKitInitialized() {
   if (webkit_platform_support_)
     return;
 
   webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl);
   blink::initialize(webkit_platform_support_.get());
+  main_thread_task_runner_ =
+      make_scoped_refptr(new SchedulerCompositorTaskRunner());
+  input_task_runner_ =
+      make_scoped_refptr(new SchedulerInputTaskRunner());
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   bool enable = command_line.HasSwitch(switches::kEnableThreadedCompositing);
   if (enable) {
 #if defined(OS_ANDROID)
     if (SynchronousCompositorFactory* factory =
         SynchronousCompositorFactory::GetInstance())
       compositor_message_loop_proxy_ =
           factory->GetCompositorMessageLoop();
@@ skipping 14 matching lines @@
 
     InputHandlerManagerClient* input_handler_manager_client = NULL;
 #if defined(OS_ANDROID)
     if (SynchronousCompositorFactory* factory =
         SynchronousCompositorFactory::GetInstance()) {
       input_handler_manager_client = factory->GetInputHandlerManagerClient();
     }
 #endif
     if (!input_handler_manager_client) {
       input_event_filter_ =
-          new InputEventFilter(this, compositor_message_loop_proxy_);
+          new InputEventFilter(this, input_task_runner_,
+                               compositor_message_loop_proxy_);
       AddFilter(input_event_filter_.get());
       input_handler_manager_client = input_event_filter_.get();
     }
     input_handler_manager_.reset(
         new InputHandlerManager(compositor_message_loop_proxy_,
                                 input_handler_manager_client));
   }
 
   scoped_refptr<base::MessageLoopProxy> output_surface_loop;
   if (enable)
@@ skipping 727 matching lines @@
   hidden_widget_count_--;
 
   if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
     return;
   }
 
   ScheduleIdleHandler(kLongIdleHandlerDelayMs);
 }
 
 }  // namespace content