webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 16 insertions, 31 deletions

diff --git a/Source/WebCore/workers/AbstractWorker.h b/Source/WebCore/workers/AbstractWorker.h
index 7848332c4..900c2cb40 100644
--- a/Source/WebCore/workers/AbstractWorker.h
+++ b/Source/WebCore/workers/AbstractWorker.h
@@ -28,46 +28,31 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AbstractWorker_h
-#define AbstractWorker_h
+#pragma once
 
-#include "ActiveDOMObject.h"
-#include "EventListener.h"
-#include "EventNames.h"
 #include "EventTarget.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/AtomicStringHash.h>
+#include "ExceptionOr.h"
 
 namespace WebCore {
 
-    class URL;
+class URL;
 
-    class AbstractWorker : public RefCounted<AbstractWorker>, public ActiveDOMObject, public EventTargetWithInlineData {
-    public:
-        // EventTarget APIs
-        virtual ScriptExecutionContext* scriptExecutionContext() const override final { return ActiveDOMObject::scriptExecutionContext(); }
+class AbstractWorker : public RefCounted<AbstractWorker>, public EventTargetWithInlineData {
+public:
+    using RefCounted::ref;
+    using RefCounted::deref;
 
-        DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
+protected:
+    AbstractWorker() = default;
 
-        using RefCounted<AbstractWorker>::ref;
-        using RefCounted<AbstractWorker>::deref;
+    // Helper function that converts a URL to an absolute URL and checks the result for validity.
+    ExceptionOr<URL> resolveURL(const String& url, bool shouldBypassMainWorldContentSecurityPolicy);
 
-        virtual ~AbstractWorker();
+    intptr_t asID() const { return reinterpret_cast<intptr_t>(this); }
 
-    protected:
-        explicit AbstractWorker(ScriptExecutionContext&);
-
-        // Helper function that converts a URL to an absolute URL and checks the result for validity.
-        URL resolveURL(const String& url, ExceptionCode& ec);
-        intptr_t asID() const { return reinterpret_cast<intptr_t>(this); }
-
-    private:
-        virtual void refEventTarget() override final { ref(); }
-        virtual void derefEventTarget() override final { deref(); }
-    };
+private:
+    void refEventTarget() final { ref(); }
+    void derefEventTarget() final { deref(); }
+};
 
 } // namespace WebCore
-
-#endif // AbstractWorker_h