Not for review - Rebase of crrev.com/62833003

Source/core/workers/WorkerThread.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include "core/dom/Microtask.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/workers/DedicatedWorkerGlobalScope.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "platform/PlatformThreadData.h"
 #include "platform/Task.h"
 #include "platform/ThreadTimers.h"
+#include "platform/TraceEvent.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebWaitableEvent.h"
 #include "public/platform/WebWorkerRunLoop.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/text/WTFString.h"
 
 #include <utility>
@@ skipping 188 matching lines @@
     WorkerThread* m_thread;
 };
 
 WorkerThread::WorkerThread(WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
     : m_terminated(false)
     , m_workerLoaderProxy(workerLoaderProxy)
     , m_workerReportingProxy(workerReportingProxy)
     , m_startupData(startupData)
     , m_shutdownEvent(adoptPtr(blink::Platform::current()->createWaitableEvent()))
     , m_terminationEvent(adoptPtr(blink::Platform::current()->createWaitableEvent()))
+    , m_teleporter(0)
+    , m_compositorId(0)
 {
     MutexLocker lock(threadSetMutex());
     workerThreads().add(this);
 }
 
 WorkerThread::~WorkerThread()
 {
     MutexLocker lock(threadSetMutex());
     ASSERT(workerThreads().contains(this));
     workerThreads().remove(this);
 }
 
 void WorkerThread::start()
 {
-    if (m_thread)
+    if (thread())
         return;
 
-    m_thread = WebThreadSupportingGC::create("WebCore: Worker");
-    m_thread->postTask(new Task(WTF::bind(&WorkerThread::initialize, this)));
+    initializeWebThread();
+    thread()->postTask(new Task(WTF::bind(&WorkerThread::initialize, this)));
 }
 
 void WorkerThread::interruptAndDispatchInspectorCommands()
 {
     MutexLocker locker(m_workerInspectorControllerMutex);
     if (m_workerInspectorController)
         m_workerInspectorController->interruptAndDispatchInspectorCommands();
 }
 
 PlatformThreadId WorkerThread::platformThreadId() const
 {
     if (!m_thread)
         return 0;
     return m_thread->platformThread().threadId();
 }
 
 void WorkerThread::initialize()
 {
+    TRACE_EVENT0("teleport", "WorkerThread::initialize");
+    // fprintf(stderr, "right here\n");
     KURL scriptURL = m_startupData->m_scriptURL;
     String sourceCode = m_startupData->m_sourceCode;
     WorkerThreadStartMode startMode = m_startupData->m_startMode;
+    m_compositorId = m_startupData->m_compositorId;
 
     {
         MutexLocker lock(m_threadCreationMutex);
 
         // The worker was terminated before the thread had a chance to run.
         if (m_terminated) {
             // Notify the proxy that the WorkerGlobalScope has been disposed of.
             // This can free this thread object, hence it must not be touched afterwards.
             m_workerReportingProxy.workerThreadTerminated();
             return;
         }
 
         m_microtaskRunner = adoptPtr(new MicrotaskRunner);
-        m_thread->addTaskObserver(m_microtaskRunner.get());
-        m_thread->attachGC();
+        thread()->addTaskObserver(m_microtaskRunner.get());
+        thread()->attachGC();
         m_workerGlobalScope = createWorkerGlobalScope(m_startupData.release());
 
         m_sharedTimer = adoptPtr(new WorkerSharedTimer(this));
         PlatformThreadData::current().threadTimers().setSharedTimer(m_sharedTimer.get());
     }
 
     // The corresponding call to didStopWorkerRunLoop is in
     // ~WorkerScriptController.
-    blink::Platform::current()->didStartWorkerRunLoop(blink::WebWorkerRunLoop(this));
+    blink::Platform::current()->didStartWorkerRunLoop(getRunLoop());
 
     // Notify proxy that a new WorkerGlobalScope has been created and started.
     m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get());
 
     WorkerScriptController* script = m_workerGlobalScope->script();
     if (!script->isExecutionForbidden())
         script->initializeContextIfNeeded();
     InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), startMode);
     script->evaluate(ScriptSourceCode(sourceCode, scriptURL));
     m_workerGlobalScope->didEvaluateWorkerScript();
 
     postInitialize();
 
     postDelayedTask(createSameThreadTask(&WorkerThread::idleHandler, this), kShortIdleHandlerDelayMs);
 }
 
+blink::WebWorkerRunLoop WorkerThread::getRunLoop() {
+    return blink::WebWorkerRunLoop(this);
+}
+
 void WorkerThread::cleanup()
 {
 
     // This should be called before we start the shutdown procedure.
     workerReportingProxy().willDestroyWorkerGlobalScope();
 
     // The below assignment will destroy the context, which will in turn notify messaging proxy.
     // We cannot let any objects survive past thread exit, because no other thread will run GC or otherwise destroy them.
     // If Oilpan is enabled, we detach of the context/global scope, with the final heap cleanup below sweeping it out.
 #if !ENABLE(OILPAN)
     ASSERT(m_workerGlobalScope->hasOneRef());
 #endif
     m_workerGlobalScope->dispose();
     m_workerGlobalScope = nullptr;
 
-    m_thread->detachGC();
+    thread()->detachGC();
 
-    m_thread->removeTaskObserver(m_microtaskRunner.get());
+    thread()->removeTaskObserver(m_microtaskRunner.get());
     m_microtaskRunner = nullptr;
 
     // Notify the proxy that the WorkerGlobalScope has been disposed of.
     // This can free this thread object, hence it must not be touched afterwards.
     workerReportingProxy().workerThreadTerminated();
 
     m_terminationEvent->signal();
 
     // Clean up PlatformThreadData before WTF::WTFThreadData goes away!
     PlatformThreadData::current().destroy();
 }
 
 class WorkerThreadShutdownFinishTask : public ExecutionContextTask {
 public:
     static PassOwnPtr<WorkerThreadShutdownFinishTask> create()
     {
         return adoptPtr(new WorkerThreadShutdownFinishTask());
     }
 
     virtual void performTask(ExecutionContext *context)
     {
         WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
         workerGlobalScope->clearInspector();
         // It's not safe to call clearScript until all the cleanup tasks posted by functions initiated by WorkerThreadShutdownStartTask have completed.
         workerGlobalScope->clearScript();
-        workerGlobalScope->thread()->m_thread->postTask(new Task(WTF::bind(&WorkerThread::cleanup, workerGlobalScope->thread())));
+        workerGlobalScope->thread()->thread()->postTask(new Task(WTF::bind(&WorkerThread::cleanup, workerGlobalScope->thread())));
     }
 
     virtual bool isCleanupTask() const { return true; }
 };
 
 class WorkerThreadShutdownStartTask : public ExecutionContextTask {
 public:
     static PassOwnPtr<WorkerThreadShutdownStartTask> create()
     {
         return adoptPtr(new WorkerThreadShutdownStartTask());
@@ skipping 67 matching lines @@
     HashSet<WorkerThread*> threads = workerThreads();
     for (WorkerThread* thread : threads)
         thread->stopInShutdownSequence();
 
     for (WorkerThread* thread : threads)
         thread->terminationEvent()->wait();
 }
 
 bool WorkerThread::isCurrentThread() const
 {
-    return m_thread && m_thread->isCurrentThread();
+    return thread() && thread()->isCurrentThread();
 }
 
 void WorkerThread::idleHandler()
 {
     ASSERT(m_workerGlobalScope.get());
     int64 delay = kLongIdleHandlerDelayMs;
 
     // Do a script engine idle notification if the next event is distant enough.
     const double kMinIdleTimespan = 0.3;
     if (m_sharedTimer->nextFireTime() == 0.0 || m_sharedTimer->nextFireTime() > currentTime() + kMinIdleTimespan) {
         bool hasMoreWork = !m_workerGlobalScope->idleNotification();
         if (hasMoreWork)
             delay = kShortIdleHandlerDelayMs;
     }
 
     postDelayedTask(createSameThreadTask(&WorkerThread::idleHandler, this), delay);
 }
 
 void WorkerThread::postTask(PassOwnPtr<ExecutionContextTask> task)
 {
-    m_thread->postTask(WorkerThreadTask::create(*this, task, true).leakPtr());
+    thread()->postTask(WorkerThreadTask::create(*this, task, true).leakPtr());
 }
 
 void WorkerThread::postDelayedTask(PassOwnPtr<ExecutionContextTask> task, long long delayMs)
 {
-    m_thread->postDelayedTask(WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs);
+    thread()->postDelayedTask(WorkerThreadTask::create(*this, task, true).leakPtr(), delayMs);
 }
 
 void WorkerThread::postDebuggerTask(PassOwnPtr<ExecutionContextTask> task)
 {
     m_debuggerMessageQueue.append(WorkerThreadTask::create(*this, task, false));
     postTask(RunDebuggerQueueTask::create(this));
 }
 
 MessageQueueWaitResult WorkerThread::runDebuggerTask(WaitMode waitMode)
 {
@@ skipping 26 matching lines @@
 {
     InspectorInstrumentation::didLeaveNestedRunLoop(m_workerGlobalScope.get());
 }
 
 void WorkerThread::setWorkerInspectorController(WorkerInspectorController* workerInspectorController)
 {
     MutexLocker locker(m_workerInspectorControllerMutex);
     m_workerInspectorController = workerInspectorController;
 }
 
+void WorkerThread::setTeleporter(WebTeleporter* teleporter)
+{
+    TRACE_EVENT0("teleport", "WorkerThread::setTeleporter");
+    m_teleporter = teleporter;
+}
+
+void WorkerThread::initializeWebThread()
+{
+    m_thread = WebThreadSupportingGC::create("WebCore: Worker");
+}
+
+blink::WebThreadSupportingGC* WorkerThread::thread() const
+{
+    return m_thread.get();
+}
+
 } // namespace blink