| Index: Source/core/workers/Worker.h
|
| diff --git a/Source/core/workers/Worker.h b/Source/core/workers/Worker.h
|
| index 7373658c2b1418177f12216ed58b3ec616b8c444..b476b015cb4b2bdb77979c99fdf191c2c77a3a71 100644
|
| --- a/Source/core/workers/Worker.h
|
| +++ b/Source/core/workers/Worker.h
|
| @@ -1,44 +1,11 @@
|
| -/*
|
| - * Copyright (C) 2008, 2010 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
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
| - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
| - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
| - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - *
|
| - */
|
| +// 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.
|
|
|
| #ifndef Worker_h
|
| #define Worker_h
|
|
|
| -#include "core/CoreExport.h"
|
| -#include "core/dom/ActiveDOMObject.h"
|
| -#include "core/dom/MessagePort.h"
|
| -#include "core/events/EventListener.h"
|
| -#include "core/events/EventTarget.h"
|
| -#include "core/workers/AbstractWorker.h"
|
| -#include "core/workers/WorkerScriptLoaderClient.h"
|
| -#include "platform/heap/Handle.h"
|
| -#include "wtf/Forward.h"
|
| -#include "wtf/PassRefPtr.h"
|
| -#include "wtf/RefPtr.h"
|
| -#include "wtf/text/AtomicStringHash.h"
|
| +#include "core/workers/InProcessWorkerBase.h"
|
|
|
| namespace blink {
|
|
|
| @@ -47,38 +14,17 @@ class ExecutionContext;
|
| class WorkerGlobalScopeProxy;
|
| class WorkerScriptLoader;
|
|
|
| -class CORE_EXPORT Worker : public AbstractWorker, private WorkerScriptLoaderClient {
|
| +class CORE_EXPORT Worker final : public InProcessWorkerBase {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static PassRefPtrWillBeRawPtr<Worker> create(ExecutionContext*, const String& url, ExceptionState&);
|
| virtual ~Worker();
|
|
|
| - virtual const AtomicString& interfaceName() const override;
|
| -
|
| - void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionState&);
|
| -
|
| - bool initialize(ExecutionContext*, const String&, ExceptionState&);
|
| - void terminate();
|
| -
|
| - virtual void stop() override;
|
| - virtual bool hasPendingActivity() const override;
|
| -
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
|
| -
|
| - DECLARE_VIRTUAL_TRACE();
|
| -
|
| protected:
|
| explicit Worker(ExecutionContext*);
|
|
|
| - virtual WorkerGlobalScopeProxy* createWorkerGlobalScopeProxy(ExecutionContext*);
|
| -
|
| -private:
|
| - // WorkerScriptLoaderClient callbacks
|
| - virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) override;
|
| - virtual void notifyFinished() override;
|
| -
|
| - RefPtr<WorkerScriptLoader> m_scriptLoader;
|
| - WorkerGlobalScopeProxy* m_contextProxy; // The proxy outlives the worker to perform thread shutdown.
|
| + WorkerGlobalScopeProxy* createWorkerGlobalScopeProxy(ExecutionContext*) override;
|
| + const AtomicString& interfaceName() const override;
|
| };
|
|
|
| } // namespace blink
|
|
|