Migrate WebGL timers to TaskRunnerTimer

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
index 247958978cea2a5563e6c6e13d3fe4bc99620bb8..c6ead75a261a894e5bbd78daa58afaef77f07e8d 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
@@ -34,6 +34,7 @@
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/FlexibleArrayBufferView.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ -1039,26 +1040,32 @@ WebGLRenderingContextBase::WebGLRenderingContextBase(
     std::unique_ptr<WebGraphicsContext3DProvider> contextProvider,
     const CanvasContextCreationAttributes& requestedAttributes,
     unsigned version)
-    : WebGLRenderingContextBase(nullptr,
-                                passedOffscreenCanvas,
-                                std::move(contextProvider),
-                                requestedAttributes,
-                                version) {}
+    : WebGLRenderingContextBase(
+          nullptr,
+          passedOffscreenCanvas,
+          TaskRunnerHelper::get(TaskType::WebGL,
+                                passedOffscreenCanvas->getExecutionContext()),
+          std::move(contextProvider),
+          requestedAttributes,
+          version) {}
 
 WebGLRenderingContextBase::WebGLRenderingContextBase(
     HTMLCanvasElement* passedCanvas,
     std::unique_ptr<WebGraphicsContext3DProvider> contextProvider,
     const CanvasContextCreationAttributes& requestedAttributes,
     unsigned version)
-    : WebGLRenderingContextBase(passedCanvas,
-                                nullptr,
-                                std::move(contextProvider),
-                                requestedAttributes,
-                                version) {}
+    : WebGLRenderingContextBase(
+          passedCanvas,
+          nullptr,
+          TaskRunnerHelper::get(TaskType::WebGL, &passedCanvas->document()),
+          std::move(contextProvider),
+          requestedAttributes,
+          version) {}
 
 WebGLRenderingContextBase::WebGLRenderingContextBase(
     HTMLCanvasElement* passedCanvas,
     OffscreenCanvas* passedOffscreenCanvas,
+    RefPtr<WebTaskRunner> taskRunner,

[haraken, 2017/01/31 02:24:35]

Can you omit this parameter? You can get the task runner by calling:

  TaskRunnerHelper::get(TaskType::WebGL, &passedOffscreenCanvas->document())

[Kai Ninomiya, 2017/01/31 02:28:44]

Unfortunately it's different for the two constructors above. Whenever this
constructor is called, either passedCanvas or passedOffscreenCanvas is null, and
the other is valid.

It could all be done inline but it would have been really ugly.

     std::unique_ptr<WebGraphicsContext3DProvider> contextProvider,
     const CanvasContextCreationAttributes& requestedAttributes,
     unsigned version)
@@ -1070,10 +1077,13 @@ WebGLRenderingContextBase::WebGLRenderingContextBase(
       m_contextLostMode(NotLostContext),
       m_autoRecoveryMethod(Manual),
       m_dispatchContextLostEventTimer(
+          taskRunner,
           this,
           &WebGLRenderingContextBase::dispatchContextLostEvent),
       m_restoreAllowed(false),
-      m_restoreTimer(this, &WebGLRenderingContextBase::maybeRestoreContext),
+      m_restoreTimer(taskRunner,
+                     this,
+                     &WebGLRenderingContextBase::maybeRestoreContext),
       m_boundArrayBuffer(this, nullptr),
       m_boundVertexArrayObject(this, nullptr),
       m_currentProgram(this, nullptr),