auto import from //depot/cupcake/@136594

1 files changed, 15 insertions, 11 deletions

diff --git a/WebCore/dom/EventTarget.h b/WebCore/dom/EventTarget.h
index da2130c..3a3ec84 100644
--- a/WebCore/dom/EventTarget.h
+++ b/WebCore/dom/EventTarget.h
@@ -42,17 +42,15 @@ namespace WebCore {
     class EventListener;
     class EventTargetNode;
     class MessagePort;
-    class RegisteredEventListener;
     class ScriptExecutionContext;
     class SVGElementInstance;
+    class Worker;
+    class WorkerContext;
     class XMLHttpRequest;
     class XMLHttpRequestUpload;
 
     typedef int ExceptionCode;
 
-    template<typename T> class DeprecatedValueList;
-    typedef DeprecatedValueList<RefPtr<RegisteredEventListener> > RegisteredEventListenerList;
-
     class EventTarget {
     public:
         virtual MessagePort* toMessagePort();
@@ -65,6 +63,10 @@ namespace WebCore {
 #if ENABLE(SVG)
         virtual SVGElementInstance* toSVGElementInstance();
 #endif
+#if ENABLE(WORKERS)
+        virtual Worker* toWorker();
+        virtual WorkerContext* toWorkerContext();
+#endif
 
         virtual ScriptExecutionContext* scriptExecutionContext() const = 0;
 
@@ -78,7 +80,7 @@ namespace WebCore {
         // Handlers to do/undo actions on the target node before an event is dispatched to it and after the event
         // has been dispatched.  The data pointer is handed back by the preDispatch and passed to postDispatch.
         virtual void* preDispatchEventHandler(Event*) { return 0; }
-        virtual void postDispatchEventHandler(Event*, void* dataFromPreDispatch) { }
+        virtual void postDispatchEventHandler(Event*, void* /*dataFromPreDispatch*/) { }
 
     protected:
         virtual ~EventTarget();
@@ -88,14 +90,16 @@ namespace WebCore {
         virtual void derefEventTarget() = 0;
     };
 
+    void forbidEventDispatch();
+    void allowEventDispatch();
+
 #ifndef NDEBUG
-void forbidEventDispatch();
-void allowEventDispatch();
-bool eventDispatchForbidden();
+    bool eventDispatchForbidden();
 #else
-inline void forbidEventDispatch() { }
-inline void allowEventDispatch() { }
-#endif // NDEBUG 
+    inline void forbidEventDispatch() { }
+    inline void allowEventDispatch() { }
+#endif
 
 }
+
 #endif