[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit d4a183cc28601ca3b1eb2f4e16dd2d0508b81b5b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 17:27:43 2004 +0000

    	- Made DOMEventTarget a formal protocol that is implemented by DOMNode
    	- Made DOMEventListener a formal protocol that any object can implement
    
            Reviewed by kocienda.
    
            * kwq/DOMCore.h:
            * kwq/DOMEvents.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d3e3fd4..f8eabf4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-05-14  Chris Blumenberg  <cblu at apple.com>
+
+	- Made DOMEventTarget a formal protocol that is implemented by DOMNode
+	- Made DOMEventListener a formal protocol that any object can implement
+
+        Reviewed by kocienda.
+
+        * kwq/DOMCore.h:
+        * kwq/DOMEvents.h:
+
 2004-05-13  Richard Williamson   <rjw at apple.com>
 
 	Removed vestigial isSelected method.
diff --git a/WebCore/kwq/DOM.mm b/WebCore/kwq/DOM.mm
index dbedf6c..c1e9e19 100644
--- a/WebCore/kwq/DOM.mm
+++ b/WebCore/kwq/DOM.mm
@@ -344,6 +344,22 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
     return Node([self _nodeImpl]).hasAttributes();
 }
 
+- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
+{
+    ERROR("unimplemented");
+}
+
+- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
+{
+    ERROR("unimplemented");
+}
+
+- (BOOL)dispatchEvent:(DOMEvent *)event
+{
+    ERROR("unimplemented");
+    return NO;
+}
+
 @end
 
 @implementation DOMNode (WebCoreInternal)
diff --git a/WebCore/kwq/DOMCore.h b/WebCore/kwq/DOMCore.h
index 90f354d..772d9d6 100644
--- a/WebCore/kwq/DOMCore.h
+++ b/WebCore/kwq/DOMCore.h
@@ -33,6 +33,8 @@
 @class DOMNamedNodeMap;
 @class DOMNodeList;
 
+ at protocol DOMEventTarget;
+
 typedef struct DOMObjectInternal DOMObjectInternal;
 
 @interface DOMObject : WebScriptObject <NSCopying>
@@ -90,7 +92,7 @@ enum {
     DOM_NOTATION_NODE                 = 12,
 };
 
- at interface DOMNode : DOMObject
+ at interface DOMNode : DOMObject <DOMEventTarget>
 - (NSString *)nodeName;
 - (NSString *)nodeValue;
 - (void)setNodeValue:(NSString *)string;
diff --git a/WebCore/kwq/DOMEvents.h b/WebCore/kwq/DOMEvents.h
index b6afbae..6d14021 100644
--- a/WebCore/kwq/DOMEvents.h
+++ b/WebCore/kwq/DOMEvents.h
@@ -26,7 +26,6 @@
 #import <WebCore/DOMViews.h>
 
 @class DOMEvent;
- at class DOMEventListener;
 
 extern NSString * const DOMEventException;
 
@@ -34,9 +33,13 @@ enum DOMEventExceptionCode {
     DOM_UNSPECIFIED_EVENT_TYPE_ERR = 0
 };
 
- at interface DOMEventTarget : DOMObject
-- (void)addEventListener:(NSString *)type :(DOMEventListener *)listener :(BOOL)useCapture;
-- (void)removeEventListener:(NSString *)type :(DOMEventListener *)listener :(BOOL)useCapture;
+ at protocol DOMEventListener <NSObject>
+- (void)handleEvent:(DOMEvent *)event;
+ at end
+
+ at protocol DOMEventTarget <NSObject>
+- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
+- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
 - (BOOL)dispatchEvent:(DOMEvent *)event;
 @end
 
@@ -48,8 +51,8 @@ enum {
 
 @interface DOMEvent : DOMObject
 - (NSString *)type;
-- (DOMEventTarget *)target;
-- (DOMEventTarget *)currentTarget;
+- (id <DOMEventTarget>)target;
+- (id <DOMEventTarget>)currentTarget;
 - (unsigned short)eventPhase;
 - (BOOL)bubbles;
 - (BOOL)cancelable;
@@ -79,8 +82,8 @@ enum {
 - (BOOL)altKey;
 - (BOOL)metaKey;
 - (unsigned short)button;
-- (DOMEventTarget *)relatedTarget;
-- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(DOMEventTarget *)relatedTargetArg;
+- (id <DOMEventTarget>)relatedTarget;
+- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg;
 @end
 
 enum {
diff --git a/WebCore/kwq/DOMEvents.mm b/WebCore/kwq/DOMEvents.mm
index 53707fe..d7cb2da 100644
--- a/WebCore/kwq/DOMEvents.mm
+++ b/WebCore/kwq/DOMEvents.mm
@@ -35,13 +35,13 @@
     return nil;
 }
 
-- (DOMEventTarget *)target
+- (id <DOMEventTarget>)target
 {
     ERROR("unimplemented");
     return nil;
 }
 
-- (DOMEventTarget *)currentTarget
+- (id <DOMEventTarget>)currentTarget
 {
     ERROR("unimplemented");
     return nil;
@@ -88,26 +88,6 @@
 
 @end
 
- at implementation DOMEventTarget
-
-- (void)addEventListener:(NSString *)type :(DOMEventListener *)listener :(BOOL)useCapture
-{
-    ERROR("unimplemented");
-}
-
-- (void)removeEventListener:(NSString *)type :(DOMEventListener *)listener :(BOOL)useCapture
-{
-    ERROR("unimplemented");
-}
-
-- (BOOL)dispatchEvent:(DOMEvent *)event
-{
-    ERROR("unimplemented");
-    return NO;
-}
-
- at end
-
 @implementation DOMMouseEvent
 
 - (long)screenX
@@ -164,13 +144,13 @@
     return 0;
 }
 
-- (DOMEventTarget *)relatedTarget
+- (id <DOMEventTarget>)relatedTarget
 {
     ERROR("unimplemented");
     return nil;
 }
 
-- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(DOMEventTarget *)relatedTargetArg
+- (void)initMouseEvent:(NSString *)typeArg :(BOOL)canBubbleArg :(BOOL)cancelableArg :(DOMAbstractView *)viewArg :(long)detailArg :(long)screenXArg :(long)screenYArg :(long)clientX :(long)clientY :(BOOL)ctrlKeyArg :(BOOL)altKeyArg :(BOOL)shiftKeyArg :(BOOL)metaKeyArg :(unsigned short)buttonArg :(id <DOMEventTarget>)relatedTargetArg
 {
     ERROR("unimplemented");
 }

-- 
WebKit Debian packaging