Index: Source/core/workers/AbstractWorker.h |
diff --git a/Source/core/workers/AbstractWorker.h b/Source/core/workers/AbstractWorker.h |
index e73baf2cd4542abe8079f1799dca210cb94fbbee..de3792a7fb410f99f88ff89c9ee2d4a4e59e592b 100644 |
--- a/Source/core/workers/AbstractWorker.h |
+++ b/Source/core/workers/AbstractWorker.h |
@@ -32,7 +32,6 @@ |
#define AbstractWorker_h |
#include "bindings/v8/ScriptWrappable.h" |
-#include "core/dom/ActiveDOMObject.h" |
#include "core/dom/EventListener.h" |
#include "core/dom/EventNames.h" |
#include "core/dom/EventTarget.h" |
@@ -46,18 +45,16 @@ namespace WebCore { |
class KURL; |
class ScriptExecutionContext; |
- class AbstractWorker : public RefCounted<AbstractWorker>, public ScriptWrappable, public ActiveDOMObject, public EventTarget { |
haraken
2013/06/19 10:24:00
Why did you move ScriptWrappable and ActiveDOMObje
do-not-use
2013/06/19 10:39:09
It did not link if AbstractWorker would subclass S
do-not-use
2013/06/19 10:52:08
I'll try to move back ActiveDOMObject to AbstractW
|
+ class AbstractWorker : public RefCounted<AbstractWorker>, public EventTarget { |
public: |
// EventTarget APIs |
- virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); } |
DEFINE_ATTRIBUTE_EVENT_LISTENER(error); |
using RefCounted<AbstractWorker>::ref; |
using RefCounted<AbstractWorker>::deref; |
- virtual void contextDestroyed() OVERRIDE; |
- AbstractWorker(ScriptExecutionContext*); |
+ AbstractWorker(); |
virtual ~AbstractWorker(); |
protected: |