Worker: Fix cross-thread violations on ObjectProxy

third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp

 // Copyright 2015 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 "modules/compositorworker/CompositorWorkerThread.h"
 
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/CompositorProxyClient.h"
 #include "core/inspector/ConsoleMessage.h"
-#include "core/testing/DummyPageHolder.h"
 #include "core/workers/InProcessWorkerObjectProxy.h"
 #include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerBackingThread.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerOrWorkletGlobalScope.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/WaitableEvent.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "platform/heap/Handle.h"
 #include "platform/testing/TestingPlatformSupport.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebAddressSpace.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 namespace {
 
 // A null InProcessWorkerObjectProxy, supplied when creating
 // CompositorWorkerThreads.
 class TestCompositorWorkerObjectProxy : public InProcessWorkerObjectProxy {
  public:
-  static std::unique_ptr<TestCompositorWorkerObjectProxy> create(
-      ExecutionContext* context) {
-    return wrapUnique(new TestCompositorWorkerObjectProxy(context));
+  static std::unique_ptr<TestCompositorWorkerObjectProxy> create() {
+    return wrapUnique(new TestCompositorWorkerObjectProxy());
   }
 
   // (Empty) WorkerReportingProxy implementation:
   virtual void dispatchErrorEvent(const String& errorMessage,
                                   std::unique_ptr<SourceLocation>,
                                   int exceptionId) {}
   void reportConsoleMessage(MessageSource,
                             MessageLevel,
                             const String& message,
                             SourceLocation*) override {}
   void postMessageToPageInspector(const String&) override {}
-  ParentFrameTaskRunners* getParentFrameTaskRunners() override {
-    return m_parentFrameTaskRunners.get();
-  }
-
   void didCreateWorkerGlobalScope(WorkerOrWorkletGlobalScope*) override {}
   void didEvaluateWorkerScript(bool success) override {}
   void didCloseWorkerGlobalScope() override {}
   void willDestroyWorkerGlobalScope() override {}
   void didTerminateWorkerThread() override {}
 
-  ExecutionContext* getExecutionContext() override {
-    return m_executionContext.get();
-  }
-
  private:
-  TestCompositorWorkerObjectProxy(ExecutionContext* context)
-      : InProcessWorkerObjectProxy(nullptr),
-        m_executionContext(context),
-        m_parentFrameTaskRunners(ParentFrameTaskRunners::create(nullptr)) {}
-
-  Persistent<ExecutionContext> m_executionContext;
-  Persistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
+  TestCompositorWorkerObjectProxy()
+      : InProcessWorkerObjectProxy(nullptr,
+                                   ParentFrameTaskRunners::create(nullptr)) {}
 };
 
 class TestCompositorProxyClient
     : public GarbageCollected<TestCompositorProxyClient>,
       public CompositorProxyClient {
   USING_GARBAGE_COLLECTED_MIXIN(TestCompositorProxyClient);
 
  public:
   TestCompositorProxyClient() {}
 
@@ skipping 19 matching lines @@
   std::unique_ptr<WebThread> m_thread;
   TestingCompositorSupport m_compositorSupport;
 };
 
 }  // namespace
 
 class CompositorWorkerThreadTest : public ::testing::Test {
  public:
   void SetUp() override {
     CompositorWorkerThread::createSharedBackingThreadForTest();
-    m_page = DummyPageHolder::create();
-    m_objectProxy =
-        TestCompositorWorkerObjectProxy::create(&m_page->document());
+    m_objectProxy = TestCompositorWorkerObjectProxy::create();
     m_securityOrigin =
         SecurityOrigin::create(KURL(ParsedURLString, "http://fake.url/"));
   }
 
   void TearDown() override {
-    m_page.reset();
     CompositorWorkerThread::clearSharedBackingThread();
   }
 
   std::unique_ptr<CompositorWorkerThread> createCompositorWorker() {
     std::unique_ptr<CompositorWorkerThread> workerThread =
         CompositorWorkerThread::create(nullptr, *m_objectProxy, 0);
     WorkerClients* clients = WorkerClients::create();
     provideCompositorProxyClientTo(clients, new TestCompositorProxyClient);
     workerThread->start(WorkerThreadStartupData::create(
         KURL(ParsedURLString, "http://fake.url/"), "fake user agent",
@@ skipping 18 matching lines @@
  private:
   void executeScriptInWorker(WorkerThread* worker, WaitableEvent* waitEvent) {
     WorkerOrWorkletScriptController* scriptController =
         worker->globalScope()->scriptController();
     bool evaluateResult = scriptController->evaluate(
         ScriptSourceCode("var counter = 0; ++counter;"));
     DCHECK(evaluateResult);
     waitEvent->signal();
   }
 
-  std::unique_ptr<DummyPageHolder> m_page;
   RefPtr<SecurityOrigin> m_securityOrigin;
   std::unique_ptr<InProcessWorkerObjectProxy> m_objectProxy;
   CompositorWorkerTestPlatform m_testPlatform;
 };
 
 TEST_F(CompositorWorkerThreadTest, Basic) {
   std::unique_ptr<CompositorWorkerThread> compositorWorker =
       createCompositorWorker();
   checkWorkerCanExecuteScript(compositorWorker.get());
   compositorWorker->terminateAndWait();
@@ skipping 81 matching lines @@
   ASSERT_TRUE(secondIsolate);
   EXPECT_EQ(firstIsolate, secondIsolate);
 
   // Verify that the isolate can run some scripts correctly in the second
   // worker.
   checkWorkerCanExecuteScript(secondWorker.get());
   secondWorker->terminateAndWait();
 }
 
 }  // namespace blink