Skip to content

GitLab

T
tangled
Commit 43271670 authored by yutak's avatar yutak Committed by Commit bot
Browse files
Options

Revert of [worklets] Introduce ThreadedWorkletMessagingProxy and... 

Revert of [worklets] Introduce ThreadedWorkletMessagingProxy and AnimationWorkletMessagaingProxy. (patchset #8 id:180001 of https://codereview.chromium.org/2312493002/ )

Reason for revert:
Caused leaks in a number of layout tests.

https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20Leak/builds/22941

Original issue's description:
> [worklets] Introduce ThreadedWorkletMessagingProxy and AnimationWorkletMessagaingProxy.
>
> This patch does the plumbing from the animationworklet to the globalscope to import scripts etc.
>
> BUG=567358
>
> Committed: https://crrev.com/4bd1a1b4e1d321526cfe0c10adc15f507a661bb8
> Cr-Commit-Position: refs/heads/master@{#418765}

TBR=nhiroki@chromium.org,hongchan@chromium.org,yhirano@chromium.org,majidvp@chromium.org,ikilpatrick@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=567358

Review-Url: https://codereview.chromium.org/2342013002
Cr-Commit-Position: refs/heads/master@{#418799}
parent 6c5aae89
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 342 deletions
third_party/WebKit/LayoutTests/http/tests/worklet/animation-worklet-import.html deleted 100644 → 0
View file @ 6c5aae89
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/import-tests.js"></script>
</head>
<body>
<script>
runImportTests(window.animationWorklet);
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/worklet/resources/import-tests.js → third_party/WebKit/LayoutTests/http/tests/worklet/import.html
View file @ 43271670
// Runs a series of tests related to importing scripts on a worklet. <!DOCTYPE html>
// <html>
// Usage: <head>
// runImportTests(workletType); <script src="../resources/testharness.js"></script>
function runImportTests(worklet) { <script src="../resources/testharnessreport.js"></script>
</head>
<body>
<script>
promise_test(function() { promise_test(function() {
return worklet.import('resources/empty-worklet-script.js').then(function(undefined_arg) { return paintWorklet.import('resources/empty-worklet-script.js').then(function(undefined_arg) {
assert_equals(undefined_arg, undefined, 'Promise should resolve with no arguments.'); assert_equals(undefined_arg, undefined, 'Promise should resolve with no arguments.');
}).catch(function(error) { }).catch(function(error) {
assert_unreached('unexpected rejection: ' + error); assert_unreached('unexpected rejection: ' + error);
...@@ -15,7 +18,7 @@ function runImportTests(worklet) { ...@@ -15,7 +18,7 @@ function runImportTests(worklet) {
promise_test(function() { promise_test(function() {
return worklet.import('resources/throwing-worklet-script.js').then(function(undefined_arg) { return paintWorklet.import('resources/throwing-worklet-script.js').then(function(undefined_arg) {
assert_equals(undefined_arg, undefined, 'Promise should resolve with no arguments.'); assert_equals(undefined_arg, undefined, 'Promise should resolve with no arguments.');
}).catch(function(error) { }).catch(function(error) {
assert_unreached('unexpected rejection: ' + error); assert_unreached('unexpected rejection: ' + error);
...@@ -25,7 +28,7 @@ function runImportTests(worklet) { ...@@ -25,7 +28,7 @@ function runImportTests(worklet) {
promise_test(function() { promise_test(function() {
return worklet.import('non-existant-worklet-script.js').then(function() { return paintWorklet.import('non-existant-worklet-script.js').then(function() {
assert_unreached('import should fail.'); assert_unreached('import should fail.');
}).catch(function(error) { }).catch(function(error) {
assert_equals(error.name, 'NetworkError', 'error should be a NetworkError.'); assert_equals(error.name, 'NetworkError', 'error should be a NetworkError.');
...@@ -35,11 +38,14 @@ function runImportTests(worklet) { ...@@ -35,11 +38,14 @@ function runImportTests(worklet) {
promise_test(function() { promise_test(function() {
return worklet.import('http://invalid:123$').then(function() { return paintWorklet.import('http://invalid:123$').then(function() {
assert_unreached('import should fail.'); assert_unreached('import should fail.');
}).catch(function(error) { }).catch(function(error) {
assert_equals(error.name, 'SyntaxError', 'error should be a SyntaxError.'); assert_equals(error.name, 'SyntaxError', 'error should be a SyntaxError.');
}); });
}, 'Attempting to resolve an invalid URL should reject the given promise with a SyntaxError.'); }, 'Attempting to resolve an invalid URL should reject the given promise with a SyntaxError.');
}
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/worklet/paint-worklet-import.html deleted 100644 → 0
View file @ 6c5aae89
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="resources/import-tests.js"></script>
</head>
<body>
<script>
runImportTests(window.paintWorklet);
</script>
</body>
</html>
third_party/WebKit/Source/core/workers/BUILD.gn
View file @ 43271670
...@@ -38,10 +38,6 @@ blink_core_sources("workers") { ...@@ -38,10 +38,6 @@ blink_core_sources("workers") {
"ThreadedWorkletGlobalScope.cpp", "ThreadedWorkletGlobalScope.cpp",
"ThreadedWorkletGlobalScope.h", "ThreadedWorkletGlobalScope.h",
"ThreadedWorkletGlobalScopeProxy.h", "ThreadedWorkletGlobalScopeProxy.h",
"ThreadedWorkletMessagingProxy.cpp",
"ThreadedWorkletMessagingProxy.h",
"ThreadedWorkletObjectProxy.cpp",
"ThreadedWorkletObjectProxy.h",
"Worker.cpp", "Worker.cpp",
"Worker.h", "Worker.h",
"WorkerBackingThread.cpp", "WorkerBackingThread.cpp",
......
third_party/WebKit/Source/core/workers/ThreadedWorkletGlobalScopeProxy.h
View file @ 43271670
...@@ -7,15 +7,19 @@ ...@@ -7,15 +7,19 @@
#include "core/workers/WorkletGlobalScopeProxy.h" #include "core/workers/WorkletGlobalScopeProxy.h"
// TODO(ikilpatrick): remove this file once AudioWorklet is no longer using it.
namespace blink { namespace blink {
class ThreadedWorkletGlobalScopeProxy : public WorkletGlobalScopeProxy { class ThreadedWorkletGlobalScopeProxy : public WorkletGlobalScopeProxy {
public: public:
void evaluateScript(const ScriptSourceCode&) final {} void evaluateScript(const ScriptSourceCode&) final
{
void terminateWorkletGlobalScope() final {} // TODO(ikilpatrick): implement.
}
void terminateWorkletGlobalScope() final
{
// TODO(ikilpatrick): implement.
}
}; };
} // namespace blink } // namespace blink
......
third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp deleted 100644 → 0
View file @ 6c5aae89
// Copyright 2016 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 "core/workers/ThreadedWorkletMessagingProxy.h"
#include "bindings/core/v8/ScriptSourceCode.h"
#include "bindings/core/v8/WorkerOrWorkletScriptController.h"
#include "core/dom/Document.h"
#include "core/dom/ExecutionContextTask.h"
#include "core/dom/SecurityContext.h"
#include "core/frame/csp/ContentSecurityPolicy.h"
#include "core/origin_trials/OriginTrialContext.h"
#include "core/workers/ThreadedWorkletObjectProxy.h"
#include "core/workers/WorkerInspectorProxy.h"
#include "core/workers/WorkerThreadStartupData.h"
#include "core/workers/WorkletGlobalScope.h"
#include "public/platform/WebTaskRunner.h"
namespace blink {
namespace {
void evaluateScriptOnWorkletGlobalScope(const String& source, const KURL& scriptURL, ExecutionContext* executionContext)
{
WorkletGlobalScope* globalScope = toWorkletGlobalScope(executionContext);
globalScope->scriptController()->evaluate(ScriptSourceCode(source, scriptURL));
}
} // namespace
ThreadedWorkletMessagingProxy::ThreadedWorkletMessagingProxy(ExecutionContext* executionContext)
: ThreadedMessagingProxyBase(executionContext)
, m_workletObjectProxy(ThreadedWorkletObjectProxy::create(this))
{
}
void ThreadedWorkletMessagingProxy::initialize()
{
DCHECK(isParentContextThread());
if (askedToTerminate())
return;
Document* document = toDocument(getExecutionContext());
SecurityOrigin* starterOrigin = document->getSecurityOrigin();
KURL scriptURL = document->url();
ContentSecurityPolicy* csp = document->contentSecurityPolicy();
DCHECK(csp);
WorkerThreadStartMode startMode = workerInspectorProxy()->workerStartMode(document);
std::unique_ptr<WorkerSettings> workerSettings = wrapUnique(new WorkerSettings(document->settings()));
// TODO(ikilpatrick): Decide on sensible a value for referrerPolicy.
std::unique_ptr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, document->userAgent(), String(), nullptr, startMode, csp->headers().get(), /* referrerPolicy */ String(), starterOrigin, nullptr, document->addressSpace(), OriginTrialContext::getTokens(document).get(), std::move(workerSettings));
initializeWorkerThread(std::move(startupData));
workerInspectorProxy()->workerThreadCreated(document, workerThread(), scriptURL);
}
void ThreadedWorkletMessagingProxy::evaluateScript(const ScriptSourceCode& scriptSourceCode)
{
postTaskToWorkerGlobalScope(BLINK_FROM_HERE, createCrossThreadTask(&evaluateScriptOnWorkletGlobalScope, scriptSourceCode.source(), scriptSourceCode.url()));
}
void ThreadedWorkletMessagingProxy::terminateWorkletGlobalScope()
{
terminateGlobalScope();
}
} // namespace blink
third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.h deleted 100644 → 0
View file @ 6c5aae89
// Copyright 2016 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.
#ifndef ThreadedWorkletMessagingProxy_h
#define ThreadedWorkletMessagingProxy_h
#include "core/CoreExport.h"
#include "core/workers/ThreadedMessagingProxyBase.h"
#include "core/workers/WorkletGlobalScopeProxy.h"
namespace blink {
class ThreadedWorkletObjectProxy;
class CORE_EXPORT ThreadedWorkletMessagingProxy
: public ThreadedMessagingProxyBase
, public WorkletGlobalScopeProxy {
public:
// WorkletGlobalScopeProxy implementation.
void evaluateScript(const ScriptSourceCode&) final;
void terminateWorkletGlobalScope() final;
void initialize();
protected:
explicit ThreadedWorkletMessagingProxy(ExecutionContext*);
ThreadedWorkletObjectProxy& workletObjectProxy() { return *m_workletObjectProxy; }
private:
std::unique_ptr<ThreadedWorkletObjectProxy> m_workletObjectProxy;
};
} // namespace blink
#endif // ThreadedWorkletMessagingProxy_h
third_party/WebKit/Source/core/workers/ThreadedWorkletObjectProxy.cpp deleted 100644 → 0
View file @ 6c5aae89
// Copyright 2016 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 "core/workers/ThreadedWorkletObjectProxy.h"
#include "bindings/core/v8/SerializedScriptValue.h"
#include "bindings/core/v8/SourceLocation.h"
#include "core/dom/Document.h"
#include "core/dom/ExecutionContext.h"
#include "core/dom/ExecutionContextTask.h"
#include "core/inspector/ConsoleMessage.h"
#include "core/workers/ThreadedWorkletMessagingProxy.h"
#include "wtf/Functional.h"
#include "wtf/PtrUtil.h"
#include <memory>
namespace blink {
std::unique_ptr<ThreadedWorkletObjectProxy> ThreadedWorkletObjectProxy::create(ThreadedWorkletMessagingProxy* messagingProxy)
{
DCHECK(messagingProxy);
return wrapUnique(new ThreadedWorkletObjectProxy(messagingProxy));
}
void ThreadedWorkletObjectProxy::postTaskToMainExecutionContext(std::unique_ptr<ExecutionContextTask> task)
{
getExecutionContext()->postTask(BLINK_FROM_HERE, std::move(task));
}
void ThreadedWorkletObjectProxy::reportConsoleMessage(MessageSource source, MessageLevel level, const String& message, SourceLocation* location)
{
getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&::blink::ThreadedWorkletMessagingProxy::reportConsoleMessage, crossThreadUnretained(m_messagingProxy), source, level, message, passed(location->clone())));
}
void ThreadedWorkletObjectProxy::postMessageToPageInspector(const String& message)
{
DCHECK(getExecutionContext()->isDocument());
toDocument(getExecutionContext())->postInspectorTask(BLINK_FROM_HERE, createCrossThreadTask(&::blink::ThreadedWorkletMessagingProxy::postMessageToPageInspector, crossThreadUnretained(m_messagingProxy), message));
}
void ThreadedWorkletObjectProxy::didCloseWorkerGlobalScope()
{
getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&::blink::ThreadedWorkletMessagingProxy::terminateGlobalScope, crossThreadUnretained(m_messagingProxy)));
}
void ThreadedWorkletObjectProxy::didTerminateWorkerThread()
{
// This will terminate the MessagingProxy.
getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&ThreadedWorkletMessagingProxy::workerThreadTerminated, crossThreadUnretained(m_messagingProxy)));
}
ThreadedWorkletObjectProxy::ThreadedWorkletObjectProxy(ThreadedWorkletMessagingProxy* messagingProxy)
: m_messagingProxy(messagingProxy)
{
}
ExecutionContext* ThreadedWorkletObjectProxy::getExecutionContext() const
{
DCHECK(m_messagingProxy);
return m_messagingProxy->getExecutionContext();
}
} // namespace blink
third_party/WebKit/Source/core/workers/ThreadedWorkletObjectProxy.h deleted 100644 → 0
View file @ 6c5aae89
// Copyright 2016 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.
#ifndef ThreadedWorkletObjectProxy_h
#define ThreadedWorkletObjectProxy_h
#include "bindings/core/v8/SourceLocation.h"
#include "core/CoreExport.h"
#include "core/dom/MessagePort.h"
#include "core/workers/WorkerReportingProxy.h"
namespace blink {
class ConsoleMessage;
class ExecutionContext;
class ExecutionContextTask;
class ThreadedWorkletMessagingProxy;
// A proxy to talk to the parent worklet object. This object is created on the
// main thread, passed on to the worklet thread, and used just to proxy
// messages to the ThreadedWorkletMessagingProxy on the main thread.
class CORE_EXPORT ThreadedWorkletObjectProxy : public WorkerReportingProxy {
USING_FAST_MALLOC(ThreadedWorkletObjectProxy);
WTF_MAKE_NONCOPYABLE(ThreadedWorkletObjectProxy);
public:
static std::unique_ptr<ThreadedWorkletObjectProxy> create(ThreadedWorkletMessagingProxy*);
~ThreadedWorkletObjectProxy() override {}
void postTaskToMainExecutionContext(std::unique_ptr<ExecutionContextTask>);
void reportPendingActivity(bool hasPendingActivity);
// WorkerReportingProxy overrides.
void reportException(const String& errorMessage, std::unique_ptr<SourceLocation>, int exceptionId) override {}
void reportConsoleMessage(MessageSource, MessageLevel, const String& message, SourceLocation*) override;
void postMessageToPageInspector(const String&) override;
void didEvaluateWorkerScript(bool success) override {}
void didCloseWorkerGlobalScope() override;
void willDestroyWorkerGlobalScope() override {}
void didTerminateWorkerThread() override;
protected:
ThreadedWorkletObjectProxy(ThreadedWorkletMessagingProxy*);
private:
ExecutionContext* getExecutionContext() const;
// This object always outlives this proxy.
ThreadedWorkletMessagingProxy* m_messagingProxy;
};
} // namespace blink
#endif // ThreadedWorkletObjectProxy_h
third_party/WebKit/Source/modules/compositorworker/AnimationWorklet.cpp
View file @ 43271670
...@@ -5,17 +5,14 @@ ...@@ -5,17 +5,14 @@
#include "modules/compositorworker/AnimationWorklet.h" #include "modules/compositorworker/AnimationWorklet.h"
#include "bindings/core/v8/V8Binding.h" #include "bindings/core/v8/V8Binding.h"
#include "core/dom/Document.h"
#include "core/frame/LocalFrame.h" #include "core/frame/LocalFrame.h"
#include "modules/compositorworker/AnimationWorkletMessagingProxy.h" #include "core/workers/ThreadedWorkletGlobalScopeProxy.h"
#include "modules/compositorworker/AnimationWorkletThread.h"
namespace blink { namespace blink {
// static // static
AnimationWorklet* AnimationWorklet::create(LocalFrame* frame) AnimationWorklet* AnimationWorklet::create(LocalFrame* frame)
{ {
AnimationWorkletThread::ensureSharedBackingThread();
AnimationWorklet* worklet = new AnimationWorklet(frame); AnimationWorklet* worklet = new AnimationWorklet(frame);
worklet->suspendIfNeeded(); worklet->suspendIfNeeded();
return worklet; return worklet;
...@@ -23,19 +20,17 @@ AnimationWorklet* AnimationWorklet::create(LocalFrame* frame) ...@@ -23,19 +20,17 @@ AnimationWorklet* AnimationWorklet::create(LocalFrame* frame)
AnimationWorklet::AnimationWorklet(LocalFrame* frame) AnimationWorklet::AnimationWorklet(LocalFrame* frame)
: Worklet(frame) : Worklet(frame)
, m_workletMessagingProxy(new AnimationWorkletMessagingProxy(frame->document())) , m_workletGlobalScopeProxy(new ThreadedWorkletGlobalScopeProxy())
{ {
m_workletMessagingProxy->initialize();
} }
AnimationWorklet::~AnimationWorklet() AnimationWorklet::~AnimationWorklet()
{ {
m_workletMessagingProxy->parentObjectDestroyed();
} }
WorkletGlobalScopeProxy* AnimationWorklet::workletGlobalScopeProxy() const WorkletGlobalScopeProxy* AnimationWorklet::workletGlobalScopeProxy() const
{ {
return m_workletMessagingProxy; return m_workletGlobalScopeProxy.get();
} }
DEFINE_TRACE(AnimationWorklet) DEFINE_TRACE(AnimationWorklet)
......
third_party/WebKit/Source/modules/compositorworker/AnimationWorklet.h
View file @ 43271670
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
namespace blink { namespace blink {
class LocalFrame; class LocalFrame;
class ThreadedWorkletMessagingProxy; class ThreadedWorkletGlobalScopeProxy;
class WorkletGlobalScopeProxy; class WorkletGlobalScopeProxy;
class MODULES_EXPORT AnimationWorklet final : public Worklet { class MODULES_EXPORT AnimationWorklet final : public Worklet {
...@@ -28,9 +28,8 @@ public: ...@@ -28,9 +28,8 @@ public:
private: private:
explicit AnimationWorklet(LocalFrame*); explicit AnimationWorklet(LocalFrame*);
// The proxy outlives the worklet as it is used to perform thread shutdown, // TODO(ikilpatrick): this will change to a raw ptr once we have a thread.
// it deletes itself once this has occured. std::unique_ptr<ThreadedWorkletGlobalScopeProxy> m_workletGlobalScopeProxy;
ThreadedWorkletMessagingProxy* const m_workletMessagingProxy;
}; };
} // namespace blink } // namespace blink
......
third_party/WebKit/Source/modules/compositorworker/AnimationWorkletMessagingProxy.cpp deleted 100644 → 0
View file @ 6c5aae89
// Copyright 2016 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/AnimationWorkletMessagingProxy.h"
#include "core/workers/ThreadedWorkletObjectProxy.h"
#include "modules/compositorworker/AnimationWorkletThread.h"
namespace blink {
AnimationWorkletMessagingProxy::AnimationWorkletMessagingProxy(ExecutionContext* executionContext)
: ThreadedWorkletMessagingProxy(executionContext)
{
}
AnimationWorkletMessagingProxy::~AnimationWorkletMessagingProxy()
{
}
std::unique_ptr<WorkerThread> AnimationWorkletMessagingProxy::createWorkerThread(double originTime)
{
return AnimationWorkletThread::create(loaderProxy(), workletObjectProxy());
}
} // namespace blink
third_party/WebKit/Source/modules/compositorworker/AnimationWorkletMessagingProxy.h deleted 100644 → 0
View file @ 6c5aae89
// Copyright 2016 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.
#ifndef AnimationWorkletMessagingProxy_h
#define AnimationWorkletMessagingProxy_h
#include "core/workers/ThreadedWorkletMessagingProxy.h"
#include "wtf/Allocator.h"
#include <memory>
namespace blink {
class ExecutionContext;
class WorkerThread;
class AnimationWorkletMessagingProxy final : public ThreadedWorkletMessagingProxy {
USING_FAST_MALLOC(AnimationWorkletMessagingProxy);
public:
explicit AnimationWorkletMessagingProxy(ExecutionContext*);
protected:
~AnimationWorkletMessagingProxy() override;
std::unique_ptr<WorkerThread> createWorkerThread(double originTime) override;
};
} // namespace blink
#endif // AnimationWorkletMessagingProxy_h
third_party/WebKit/Source/modules/compositorworker/BUILD.gn
View file @ 43271670
...@@ -12,8 +12,6 @@ blink_modules_sources("compositorworker") { ...@@ -12,8 +12,6 @@ blink_modules_sources("compositorworker") {
"AnimationWorklet.h", "AnimationWorklet.h",
"AnimationWorkletGlobalScope.cpp", "AnimationWorkletGlobalScope.cpp",
"AnimationWorkletGlobalScope.h", "AnimationWorkletGlobalScope.h",
"AnimationWorkletMessagingProxy.cpp",
"AnimationWorkletMessagingProxy.h",
"AnimationWorkletThread.cpp", "AnimationWorkletThread.cpp",
"AnimationWorkletThread.h", "AnimationWorkletThread.h",
"CompositorWorker.cpp", "CompositorWorker.cpp",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment