Reviewed by Darin.
- Added @property syntax to non-generated headers
inside #ifndef BUILDING_ON_TIGER.
- Changed the DOMEventTarget protocol to have have new versions
of addEventListener and removeEventListener with named parameters.
These old style methods can be removed once Mail changes to use
the new methods <rdar://problem/
4746649>.
* WebCorePrefix.h: define BUILDING_ON_TIGER when Tiger is the target
* bindings/objc/DOM.mm:
(-[DOMNode addEventListener:listener:useCapture:]):
(-[DOMNode addEventListener:::]): call the new method
(-[DOMNode removeEventListener:listener:useCapture:]):
(-[DOMNode removeEventListener:::]): call the new method
* bindings/objc/DOMAbstractView.h:
* bindings/objc/DOMEventTarget.h:
* bindings/objc/DOMHTMLAppletElement.h:
* bindings/objc/DOMHTMLEmbedElement.h:
* bindings/objc/DOMHTMLOptionElement.h:
* bindings/objc/DOMObject.h:
* bindings/objc/DOMRGBColor.h:
WebKit:
Reviewed by Darin.
Pass all headers through unifdef to filter out BUILDING_ON_TIGER blocks
if MACOSX_DEPLOYMENT_TARGET is 10.4.
* MigrateHeaders.make:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16535
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-09-22 Timothy Hatcher <timothy@apple.com>
+
+ Reviewed by Darin.
+
+ - Added @property syntax to non-generated headers
+ inside #ifndef BUILDING_ON_TIGER.
+ - Changed the DOMEventTarget protocol to have have new versions
+ of addEventListener and removeEventListener with named parameters.
+ These old style methods can be removed once Mail changes to use
+ the new methods <rdar://problem/4746649>.
+
+ * WebCorePrefix.h: define BUILDING_ON_TIGER when Tiger is the target
+ * bindings/objc/DOM.mm:
+ (-[DOMNode addEventListener:listener:useCapture:]):
+ (-[DOMNode addEventListener:::]): call the new method
+ (-[DOMNode removeEventListener:listener:useCapture:]):
+ (-[DOMNode removeEventListener:::]): call the new method
+ * bindings/objc/DOMAbstractView.h:
+ * bindings/objc/DOMEventTarget.h:
+ * bindings/objc/DOMHTMLAppletElement.h:
+ * bindings/objc/DOMHTMLEmbedElement.h:
+ * bindings/objc/DOMHTMLOptionElement.h:
+ * bindings/objc/DOMObject.h:
+ * bindings/objc/DOMRGBColor.h:
+
2006-09-22 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed by Eric.
#import <Cocoa/Cocoa.h>
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+#define BUILDING_ON_TIGER 1
+#endif
+
#endif
#ifdef __cplusplus
@end
-// FIXME: this should be auto-genenerate in DOMNode.mm
+// FIXME: this should be auto-generated
@implementation DOMNode (DOMEventTarget)
-- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
+- (void)addEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture
{
if (![self _node]->isEventTargetNode())
raiseDOMException(DOM_NOT_SUPPORTED_ERR);
wrapper->deref();
}
-- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
+- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
+{
+ // FIXME: this method can be removed once Mail changes to use the new method <rdar://problem/4746649>
+ [self addEventListener:type listener:listener useCapture:useCapture];
+}
+
+- (void)removeEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture
{
if (![self _node]->isEventTargetNode())
raiseDOMException(DOM_NOT_SUPPORTED_ERR);
EventTargetNodeCast([self _node])->removeEventListener(type, wrapper, useCapture);
}
+- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture
+{
+ // FIXME: this method can be removed once Mail changes to use the new method <rdar://problem/4746649>
+ [self removeEventListener:type listener:listener useCapture:useCapture];
+}
+
- (BOOL)dispatchEvent:(DOMEvent *)event
{
if (![self _node]->isEventTargetNode())
@class DOMDocument;
@interface DOMAbstractView : DOMObject
+#ifndef BUILDING_ON_TIGER
+@property(readonly) DOMDocument *document;
+#else
- (DOMDocument *)document;
+#endif
@end
@protocol DOMEventListener;
@protocol DOMEventTarget <NSObject, NSCopying>
-- (void)addEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
-- (void)removeEventListener:(NSString *)type :(id <DOMEventListener>)listener :(BOOL)useCapture;
+- (void)addEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture;
+- (void)removeEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture;
- (BOOL)dispatchEvent:(DOMEvent *)event;
@end
#import <WebCore/DOMHTMLElement.h>
@interface DOMHTMLAppletElement : DOMHTMLElement
+#ifndef BUILDING_ON_TIGER
+@property NSString *align;
+@property NSString *alt;
+@property NSString *archive;
+@property NSString *code;
+@property NSString *codeBase;
+@property NSString *height;
+@property int hspace;
+@property NSString *name;
+@property NSString *object;
+@property int vspace;
+@property NSString *width;
+#else
- (NSString *)align;
- (void)setAlign:(NSString *)align;
- (NSString *)alt;
- (void)setVspace:(int)vspace;
- (NSString *)width;
- (void)setWidth:(NSString *)width;
+#endif
@end
#import <WebCore/DOMHTMLElement.h>
@interface DOMHTMLEmbedElement : DOMHTMLElement
+#ifndef BUILDING_ON_TIGER
+@property NSString *align;
+@property int height;
+@property NSString *name;
+@property NSString *src;
+@property NSString *type;
+@property int width;
+#else
- (NSString *)align;
- (void)setAlign:(NSString *)newAlign;
- (int)height;
- (void)setType:(NSString *)newType;
- (int)width;
- (void)setWidth:(int)newWidth;
+#endif
@end
@class DOMHTMLFormElement;
@interface DOMHTMLOptionElement : DOMHTMLElement
+#ifndef BUILDING_ON_TIGER
+@property(readonly) DOMHTMLFormElement *form;
+@property BOOL defaultSelected;
+@property(readonly) NSString *text;
+@property(readonly) int index;
+@property BOOL disabled;
+@property NSString *label;
+@property BOOL selected;
+@property NSString *value;
+#else
- (DOMHTMLFormElement *)form;
- (BOOL)defaultSelected;
- (void)setDefaultSelected:(BOOL)defaultSelected;
- (void)setSelected:(BOOL)selected;
- (NSString *)value;
- (void)setValue:(NSString *)value;
+#endif
@end
@end
@interface DOMObject (DOMLinkStyle)
+#ifndef BUILDING_ON_TIGER
+@property(readonly) DOMStyleSheet *sheet;
+#else
- (DOMStyleSheet *)sheet;
+#endif
@end
@class DOMCSSPrimitiveValue;
@interface DOMRGBColor : DOMObject
+#ifndef BUILDING_ON_TIGER
+@property(readonly) DOMCSSPrimitiveValue *red;
+@property(readonly) DOMCSSPrimitiveValue *green;
+@property(readonly) DOMCSSPrimitiveValue *blue;
+#else
- (DOMCSSPrimitiveValue *)red;
- (DOMCSSPrimitiveValue *)green;
- (DOMCSSPrimitiveValue *)blue;
+#endif
@end
@interface DOMRGBColor (DOMRGBColorExtensions)
+#ifndef BUILDING_ON_TIGER
+@property(readonly) DOMCSSPrimitiveValue *alpha;
+@property(readonly) NSColor *color;
+#else
- (DOMCSSPrimitiveValue *)alpha;
- (NSColor *)color;
+#endif
@end
+2006-09-22 Timothy Hatcher <timothy@apple.com>
+
+ Reviewed by Darin.
+
+ Pass all headers through unifdef to filter out BUILDING_ON_TIGER blocks
+ if MACOSX_DEPLOYMENT_TARGET is 10.4.
+
+ * MigrateHeaders.make:
+
2006-09-20 Justin Garcia <justin.garcia@apple.com>
Reviewed by john
#
REPLACE_RULES = -e s/WebCore/WebKit/ -e s/JavaScriptCore/WebKit/ -e s/DOMDOMImplementation/DOMImplementation/
-HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< > $@
+HEADER_MIGRATE_CMD = sed $(REPLACE_RULES) $< $(PROCESS_HEADER_FOR_MACOSX_TARGET_CMD) > $@
+
+ifeq ($(MACOSX_DEPLOYMENT_TARGET),10.4)
+PROCESS_HEADER_FOR_MACOSX_TARGET_CMD = | ( unifdef -DBUILDING_ON_TIGER || exit 0 )
+else
+PROCESS_HEADER_FOR_MACOSX_TARGET_CMD = | ( unifdef -UBUILDING_ON_TIGER || exit 0 )
+endif
$(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM%
$(HEADER_MIGRATE_CMD)