[worklets] Move ConsoleMessageStorage to WorkerThread instead of WorkerGlobalScope.

third_party/WebKit/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 13 matching lines @@
  *
  */
 
 #include "core/workers/WorkerThread.h"
 
 #include "bindings/core/v8/Microtask.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8IdleTaskRunner.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
+#include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTaskRunner.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/inspector/WorkerThreadDebugger.h"
 #include "core/origin_trials/OriginTrialContext.h"
 #include "core/workers/WorkerBackingThread.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
@@ skipping 441 matching lines @@
         if (isOwningBackingThread())
             workerBackingThread().initialize();
 
         if (shouldAttachThreadDebugger())
             V8PerIsolateData::from(isolate())->setThreadDebugger(wrapUnique(new WorkerThreadDebugger(this, isolate())));
         m_microtaskRunner = wrapUnique(new WorkerMicrotaskRunner(this));
         workerBackingThread().backingThread().addTaskObserver(m_microtaskRunner.get());
 
         // Optimize for memory usage instead of latency for the worker isolate.
         isolate()->IsolateInBackgroundNotification();
+        m_consoleMessageStorage = new ConsoleMessageStorage();
         m_globalScope = createWorkerGlobalScope(std::move(startupData));
         m_workerInspectorController = WorkerInspectorController::create(this);
         if (m_globalScope->isWorkerGlobalScope())
             toWorkerGlobalScope(m_globalScope)->scriptLoaded(sourceCode.length(), cachedMetaData.get() ? cachedMetaData->size() : 0);
 
         // Notify proxy that a new WorkerOrWorkletGlobalScope has been created
         // and started.
         m_workerReportingProxy.workerGlobalScopeStarted(m_globalScope.get());
 
         WorkerOrWorkletScriptController* scriptController = m_globalScope->scriptController();
@@ skipping 51 matching lines @@
     }
 
     m_inspectorTaskRunner->kill();
     workerReportingProxy().willDestroyWorkerGlobalScope();
     InspectorInstrumentation::allAsyncTasksCanceled(globalScope());
     globalScope()->dispose();
     if (m_workerInspectorController) {
         m_workerInspectorController->dispose();
         m_workerInspectorController.clear();
     }
+    if (m_consoleMessageStorage)

[yhirano, 2016/08/09 06:33:06]

Why don't you clear the pointer unconditionally?

[ikilpatrick, 2016/08/09 14:13:58]

Done.

+        m_consoleMessageStorage.clear();
     workerBackingThread().backingThread().removeTaskObserver(m_microtaskRunner.get());
 }
 
 void WorkerThread::performShutdownOnWorkerThread()
 {
     DCHECK(isCurrentThread());
 #if DCHECK_IS_ON
     {
         MutexLocker lock(m_threadStateMutex);
         DCHECK(m_terminated);
@@ skipping 83 matching lines @@
         (*task)();
 }
 
 WorkerThread::ExitCode WorkerThread::getExitCode()
 {
     MutexLocker lock(m_threadStateMutex);
     return m_exitCode;
 }
 
 } // namespace blink