[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:47:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0e88641c670fde99c983f5b8446563720e80db8e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 8 22:07:38 2002 +0000
Made getAttributeNodeNamed match spec, changed
to getAttributeNode.
* DOM.subproj/WebDOMElement.h:
Implemented WebCoreDOMElement.
Fixed extra deref of impl in subclasses
of WebCoreDOMNode.
* khtml/dom/dom_element.h:
* khtml/dom/dom_node.h:
* khtml/xml/dom_elementimpl.h:
* khtml/xml/dom_nodeimpl.h:
* kwq/WebCoreDOMDocument.mm:
(-[WebCoreDOMDocument initWithImpl:DOM::]):
* kwq/WebCoreDOMNode.mm:
(DOM::NodeListImpl::createInstance):
(DOM::NamedNodeMapImpl::createInstance):
(DOM::AttrImpl::createInstance):
(DOM::ElementImpl::createInstance):
(-[WebCoreDOMNodeList length]):
(-[WebCoreDOMNodeList item:]):
(-[WebCoreDOMAttr initWithImpl:DOM::]):
(+[WebCoreDOMDocumentFragment documentFragmentWithImpl:DOM::]):
(-[WebCoreDOMElement tagName]):
(-[WebCoreDOMElement setAttribute::]):
(-[WebCoreDOMElement removeAttribute:]):
(-[WebCoreDOMElement getAttributeNode:]):
(-[WebCoreDOMElement removeAttributeNode:]):
(-[WebCoreDOMElement getElementsByTagName:]):
(-[WebCoreDOMElement getAttributeNS::]):
(-[WebCoreDOMElement setAttributeNS:::]):
* kwq/WebDOMDocument.h:
* kwq/WebDOMElement.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a5a8fba..8b3118b 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,37 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Implemented WebCoreDOMElement.
+ Fixed extra deref of impl in subclasses
+ of WebCoreDOMNode.
+
+ * khtml/dom/dom_element.h:
+ * khtml/dom/dom_node.h:
+ * khtml/xml/dom_elementimpl.h:
+ * khtml/xml/dom_nodeimpl.h:
+ * kwq/WebCoreDOMDocument.mm:
+ (-[WebCoreDOMDocument initWithImpl:DOM::]):
+ * kwq/WebCoreDOMNode.mm:
+ (DOM::NodeListImpl::createInstance):
+ (DOM::NamedNodeMapImpl::createInstance):
+ (DOM::AttrImpl::createInstance):
+ (DOM::ElementImpl::createInstance):
+ (-[WebCoreDOMNodeList length]):
+ (-[WebCoreDOMNodeList item:]):
+ (-[WebCoreDOMAttr initWithImpl:DOM::]):
+ (+[WebCoreDOMDocumentFragment documentFragmentWithImpl:DOM::]):
+ (-[WebCoreDOMElement tagName]):
+ (-[WebCoreDOMElement setAttribute::]):
+ (-[WebCoreDOMElement removeAttribute:]):
+ (-[WebCoreDOMElement getAttributeNode:]):
+ (-[WebCoreDOMElement removeAttributeNode:]):
+ (-[WebCoreDOMElement getElementsByTagName:]):
+ (-[WebCoreDOMElement getAttributeNS::]):
+ (-[WebCoreDOMElement setAttributeNS:::]):
+ * kwq/WebDOMDocument.h:
+ * kwq/WebDOMElement.h:
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
First cut at ObjC stubs for DOM API. Finished the
main classes. Need to finish
WebDOMElement, WebDOMElement, WebDOMElement,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a5a8fba..8b3118b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,37 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Implemented WebCoreDOMElement.
+ Fixed extra deref of impl in subclasses
+ of WebCoreDOMNode.
+
+ * khtml/dom/dom_element.h:
+ * khtml/dom/dom_node.h:
+ * khtml/xml/dom_elementimpl.h:
+ * khtml/xml/dom_nodeimpl.h:
+ * kwq/WebCoreDOMDocument.mm:
+ (-[WebCoreDOMDocument initWithImpl:DOM::]):
+ * kwq/WebCoreDOMNode.mm:
+ (DOM::NodeListImpl::createInstance):
+ (DOM::NamedNodeMapImpl::createInstance):
+ (DOM::AttrImpl::createInstance):
+ (DOM::ElementImpl::createInstance):
+ (-[WebCoreDOMNodeList length]):
+ (-[WebCoreDOMNodeList item:]):
+ (-[WebCoreDOMAttr initWithImpl:DOM::]):
+ (+[WebCoreDOMDocumentFragment documentFragmentWithImpl:DOM::]):
+ (-[WebCoreDOMElement tagName]):
+ (-[WebCoreDOMElement setAttribute::]):
+ (-[WebCoreDOMElement removeAttribute:]):
+ (-[WebCoreDOMElement getAttributeNode:]):
+ (-[WebCoreDOMElement removeAttributeNode:]):
+ (-[WebCoreDOMElement getElementsByTagName:]):
+ (-[WebCoreDOMElement getAttributeNS::]):
+ (-[WebCoreDOMElement setAttributeNS:::]):
+ * kwq/WebDOMDocument.h:
+ * kwq/WebDOMElement.h:
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
First cut at ObjC stubs for DOM API. Finished the
main classes. Need to finish
WebDOMElement, WebDOMElement, WebDOMElement,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a5a8fba..8b3118b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,37 @@
2002-10-08 Richard Williamson <rjw at apple.com>
+ Implemented WebCoreDOMElement.
+ Fixed extra deref of impl in subclasses
+ of WebCoreDOMNode.
+
+ * khtml/dom/dom_element.h:
+ * khtml/dom/dom_node.h:
+ * khtml/xml/dom_elementimpl.h:
+ * khtml/xml/dom_nodeimpl.h:
+ * kwq/WebCoreDOMDocument.mm:
+ (-[WebCoreDOMDocument initWithImpl:DOM::]):
+ * kwq/WebCoreDOMNode.mm:
+ (DOM::NodeListImpl::createInstance):
+ (DOM::NamedNodeMapImpl::createInstance):
+ (DOM::AttrImpl::createInstance):
+ (DOM::ElementImpl::createInstance):
+ (-[WebCoreDOMNodeList length]):
+ (-[WebCoreDOMNodeList item:]):
+ (-[WebCoreDOMAttr initWithImpl:DOM::]):
+ (+[WebCoreDOMDocumentFragment documentFragmentWithImpl:DOM::]):
+ (-[WebCoreDOMElement tagName]):
+ (-[WebCoreDOMElement setAttribute::]):
+ (-[WebCoreDOMElement removeAttribute:]):
+ (-[WebCoreDOMElement getAttributeNode:]):
+ (-[WebCoreDOMElement removeAttributeNode:]):
+ (-[WebCoreDOMElement getElementsByTagName:]):
+ (-[WebCoreDOMElement getAttributeNS::]):
+ (-[WebCoreDOMElement setAttributeNS:::]):
+ * kwq/WebDOMDocument.h:
+ * kwq/WebDOMElement.h:
+
+2002-10-08 Richard Williamson <rjw at apple.com>
+
First cut at ObjC stubs for DOM API. Finished the
main classes. Need to finish
WebDOMElement, WebDOMElement, WebDOMElement,
diff --git a/WebCore/khtml/dom/dom_element.h b/WebCore/khtml/dom/dom_element.h
index d0a3c50..da382b1 100644
--- a/WebCore/khtml/dom/dom_element.h
+++ b/WebCore/khtml/dom/dom_element.h
@@ -211,6 +211,9 @@ class Element : public Node
friend class Document;
friend class HTMLDocument;
// friend class AttrImpl;
+#ifdef APPLE_CHANGES
+ friend class ElementImpl;
+#endif
friend class Attr;
public:
diff --git a/WebCore/khtml/dom/dom_node.h b/WebCore/khtml/dom/dom_node.h
index 90a4a4f..3a2debb 100644
--- a/WebCore/khtml/dom/dom_node.h
+++ b/WebCore/khtml/dom/dom_node.h
@@ -897,6 +897,9 @@ class NodeList
friend class Node;
friend class Document;
friend class HTMLDocument;
+#ifdef APPLE_CHANGES
+ friend class NodeListImpl;
+#endif
public:
NodeList();
diff --git a/WebCore/khtml/xml/dom_elementimpl.h b/WebCore/khtml/xml/dom_elementimpl.h
index 8a3986c..9d78a63 100644
--- a/WebCore/khtml/xml/dom_elementimpl.h
+++ b/WebCore/khtml/xml/dom_elementimpl.h
@@ -210,6 +210,9 @@ public:
virtual void dump(QTextStream *stream, QString ind = "") const;
#endif
+#ifdef APPLE_CHANGES
+ static Element createInstance(ElementImpl *impl);
+#endif
protected:
void createAttributeMap() const;
void createDecl();
diff --git a/WebCore/khtml/xml/dom_nodeimpl.h b/WebCore/khtml/xml/dom_nodeimpl.h
index 6867e22..9cd4df4 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.h
+++ b/WebCore/khtml/xml/dom_nodeimpl.h
@@ -460,6 +460,9 @@ public:
// Other methods (not part of DOM)
+#ifdef APPLE_CHANGES
+ static NodeList createInstance(NodeListImpl *impl);
+#endif
protected:
// helper functions for searching all ElementImpls in a tree
unsigned long recursiveLength(NodeImpl *start) const;
diff --git a/WebCore/kwq/WebCoreDOMDocument.mm b/WebCore/kwq/WebCoreDOMDocument.mm
index 3ec9653..1a7a4cf 100644
--- a/WebCore/kwq/WebCoreDOMDocument.mm
+++ b/WebCore/kwq/WebCoreDOMDocument.mm
@@ -29,6 +29,7 @@ DOM::DOMString NSStringToDOMString(NSString *aString)
return DOM::DOMString();
}
+
@implementation WebCoreDOMDocumentType
+ (WebCoreDOMDocumentType *)documentTypeWithImpl: (DOM::DocumentTypeImpl *)_impl
@@ -42,12 +43,6 @@ DOM::DOMString NSStringToDOMString(NSString *aString)
return self;
}
-- (void)dealloc
-{
- impl->deref();
- [super dealloc];
-}
-
- (DOM::DocumentTypeImpl *)impl
{
return (DOM::DocumentTypeImpl *)impl;
@@ -162,12 +157,6 @@ DOM::DOMString NSStringToDOMString(NSString *aString)
return self;
}
-- (void)dealloc
-{
- impl->deref();
- [super dealloc];
-}
-
- (DOM::DocumentImpl *)impl
{
return (DOM::DocumentImpl *)impl;
diff --git a/WebCore/kwq/WebCoreDOMNode.mm b/WebCore/kwq/WebCoreDOMNode.mm
index 06ae4c9..1f9ee90 100644
--- a/WebCore/kwq/WebCoreDOMNode.mm
+++ b/WebCore/kwq/WebCoreDOMNode.mm
@@ -4,17 +4,27 @@
*/
#import "WebCoreDOMPrivate.h"
+DOM::NodeList DOM::NodeListImpl::createInstance(DOM::NodeListImpl *impl)
+{
+ return DOM::NodeList(impl);
+}
-DOM::NamedNodeMap DOM::NamedNodeMapImpl::createInstance(NamedNodeMapImpl *impl)
+DOM::NamedNodeMap DOM::NamedNodeMapImpl::createInstance(DOM::NamedNodeMapImpl *impl)
{
return DOM::NamedNodeMap(impl);
}
-DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
+DOM::Attr DOM::AttrImpl::createInstance(DOM::AttrImpl *impl)
{
return DOM::Attr(impl);
}
+DOM::Element DOM::ElementImpl::createInstance(DOM::ElementImpl *impl)
+{
+ return DOM::Element(impl);
+}
+
+
@implementation WebCoreDOMNode
+ (WebCoreDOMNode *)nodeWithImpl: (DOM::NodeImpl *)_impl
@@ -246,6 +256,18 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
[super dealloc];
}
+- (unsigned long)length
+{
+ return [self impl]->length();
+}
+
+- (id<WebDOMNode>)item: (unsigned long)index
+{
+ DOM::NodeList instance = DOM::NodeListImpl::createInstance([self impl]);
+
+ return [WebCoreDOMNode nodeWithImpl: (DOM::NodeImpl *)instance.item(index).handle()];
+}
+
@end
@@ -341,10 +363,7 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
- initWithImpl:(DOM::AttrImpl *)coreImpl
{
- [super init];
- impl = coreImpl;
- impl->ref();
- return self;
+ return [super initWithImpl:coreImpl];
}
- (DOM::AttrImpl *)impl
@@ -352,12 +371,6 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
return (DOM::AttrImpl *)impl;
}
-- (void)dealloc
-{
- [self impl]->deref();
- [super dealloc];
-}
-
- (NSString *)name
{
DOM::Attr instance = DOM::AttrImpl::createInstance([self impl]);
@@ -399,52 +412,158 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
{
return [[(WebCoreDOMCDATASection *)[[self class] alloc] initWithImpl: _impl] autorelease];
}
+- initWithImpl:(DOM::CDATASectionImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
+- (DOM::CDATASectionImpl *)impl { return (DOM::CDATASectionImpl *)impl; }
-- initWithImpl:(DOM::CDATASectionImpl *)coreImpl
-{
- [super init];
- impl = coreImpl;
- impl->ref();
- return self;
-}
-
-- (DOM::CDATASectionImpl *)impl
-{
- return (DOM::CDATASectionImpl *)impl;
-}
-
-- (void)dealloc
-{
- [self impl]->deref();
- [super dealloc];
-}
-
+// No additional methods.
@end
@implementation WebCoreDOMDocumentFragment
-+ (WebCoreDOMDocumentFragment *)documentFragmentWithImpl: (DOM::DocumentFragmentImpl *)_impl { return [[(WebCoreDOMDocumentFragment *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::DocumentFragmentImpl *)coreImpl { [super init]; impl = coreImpl; impl->ref(); return self; }
++ (WebCoreDOMDocumentFragment *)documentFragmentWithImpl: (DOM::DocumentFragmentImpl *)_impl
+{
+ return [[(WebCoreDOMDocumentFragment *)[[self class] alloc] initWithImpl: _impl] autorelease];
+}
+- initWithImpl:(DOM::DocumentFragmentImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
- (DOM::DocumentFragmentImpl *)impl { return (DOM::DocumentFragmentImpl *)impl; }
-- (void)dealloc { [self impl]->deref(); [super dealloc]; }
+// No additional methods.
@end
@implementation WebCoreDOMComment
+ (WebCoreDOMComment *)commentWithImpl: (DOM::CommentImpl *)_impl { return [[(WebCoreDOMComment *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::CommentImpl *)coreImpl { [super init]; impl = coreImpl; impl->ref(); return self; }
+- initWithImpl:(DOM::CommentImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
- (DOM::CommentImpl *)impl { return (DOM::CommentImpl *)impl; }
-- (void)dealloc { [self impl]->deref(); [super dealloc]; }
@end
@implementation WebCoreDOMElement
+ (WebCoreDOMElement *)elementWithImpl: (DOM::ElementImpl *)_impl { return [[(WebCoreDOMElement *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::ElementImpl *)coreImpl { [super init]; impl = coreImpl; impl->ref(); return self; }
+- initWithImpl:(DOM::ElementImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
- (DOM::ElementImpl *)impl { return (DOM::ElementImpl *)impl; }
-- (void)dealloc { [self impl]->deref(); [super dealloc]; }
+
+- (NSString *)tagName
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::DOMString _tagName = instance.tagName();
+
+ return domStringToNSString(_tagName);
+}
+
+- (NSString *)getAttribute: (NSString *)name;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::DOMString _attribute = instance.getAttribute(NSStringToDOMString(name));
+
+ return domStringToNSString(_attribute);
+}
+
+- (void)setAttribute:(NSString *)name :(NSString *)value
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ instance.setAttribute(NSStringToDOMString(name), NSStringToDOMString(value));
+}
+
+- (void)removeAttribute:(NSString *)name
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ instance.removeAttribute(NSStringToDOMString(name));
+}
+
+- (id<WebDOMAttr>)getAttributeNode:(NSString *)name
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Attr ret = instance.getAttributeNode(NSStringToDOMString(name));
+
+ return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
+}
+
+- (id<WebDOMAttr>)setAttributeNode:(id<WebDOMAttr>)newAttr;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Attr _newAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)newAttr impl]);
+ DOM::Attr ret = instance.setAttributeNode(_newAttr);
+
+ return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
+}
+
+- (id<WebDOMAttr>)removeAttributeNode:(id<WebDOMAttr>)oldAttr
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Attr _oldAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)oldAttr impl]);
+ DOM::Attr ret = instance.removeAttributeNode(_oldAttr);
+
+ return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
+}
+
+- (id<WebDOMNodeList>)getElementsByTagName:(NSString *)name
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::NodeList ret = instance.getElementsByTagName(NSStringToDOMString(name));
+
+ return [WebCoreDOMNodeList nodeListWithImpl: (DOM::NodeListImpl *)ret.handle()];
+}
+
+- (id<WebDOMNodeList>)getElementsByTagNameNS:(NSString *)namespaceURI :(NSString *)localName;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::NodeList ret = instance.getElementsByTagNameNS(NSStringToDOMString(namespaceURI),NSStringToDOMString(localName));
+
+ return [WebCoreDOMNodeList nodeListWithImpl: (DOM::NodeListImpl *)ret.handle()];
+}
+
+- (NSString *)getAttributeNS:(NSString *)namespaceURI :(NSString *)localName
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::DOMString ret = instance.getAttributeNS(NSStringToDOMString(namespaceURI),NSStringToDOMString(localName));
+
+ return domStringToNSString(ret);
+}
+
+- (void)setAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName :(NSString *)value
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ instance.setAttributeNS(NSStringToDOMString(namespaceURI), NSStringToDOMString(qualifiedName), NSStringToDOMString(value));
+}
+
+- (void)removeAttributeNS:(NSString *)namespaceURI :(NSString *)localName;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ instance.removeAttributeNS(NSStringToDOMString(namespaceURI),NSStringToDOMString(localName));
+}
+
+- (id<WebDOMAttr>)getAttributeNodeNS:(NSString *)namespaceURI :(NSString *)localName;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Attr ret = instance.getAttributeNodeNS(NSStringToDOMString(namespaceURI), NSStringToDOMString(localName));
+
+ return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
+}
+
+- (id<WebDOMAttr>)setAttributeNodeNS:(id<WebDOMAttr>)newAttr;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Attr _newAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)newAttr impl]);
+ DOM::Attr ret = instance.setAttributeNodeNS(_newAttr);
+
+ return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
+}
+
+- (BOOL)hasAttribute: (NSString *)name;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+
+ return instance.hasAttribute (NSStringToDOMString(name));
+}
+
+- (BOOL)hasAttributeNS:(NSString *)namespaceURI :(NSString *)localName;
+{
+ DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+
+ return instance.hasAttributeNS (NSStringToDOMString(namespaceURI), NSStringToDOMString(localName));
+}
@end
@@ -452,9 +571,8 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
@implementation WebCoreDOMEntityReference
+ (WebCoreDOMEntityReference *)entityReferenceWithImpl: (DOM::EntityReferenceImpl *)_impl { return [[(WebCoreDOMEntityReference *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::EntityReferenceImpl *)coreImpl { [super init]; impl = coreImpl; impl->ref(); return self; }
+- initWithImpl:(DOM::EntityReferenceImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
- (DOM::EntityReferenceImpl *)impl { return (DOM::EntityReferenceImpl *)impl; }
-- (void)dealloc { [self impl]->deref(); [super dealloc]; }
@end
@@ -462,9 +580,8 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
@implementation WebCoreDOMText
+ (WebCoreDOMText *)textWithImpl: (DOM::TextImpl *)_impl { return [[(WebCoreDOMText *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::TextImpl *)coreImpl { [super init]; impl = coreImpl; impl->ref(); return self; }
+- initWithImpl:(DOM::TextImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
- (DOM::TextImpl *)impl { return (DOM::TextImpl *)impl; }
-- (void)dealloc { [self impl]->deref(); [super dealloc]; }
@end
@@ -473,9 +590,8 @@ DOM::Attr DOM::AttrImpl::createInstance(AttrImpl *impl)
+ (WebCoreDOMProcessingInstruction *)processingInstructionWithImpl: (DOM::ProcessingInstructionImpl *)_impl
{ return [[(WebCoreDOMProcessingInstruction *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::ProcessingInstructionImpl *)coreImpl { [super init]; impl = coreImpl; impl->ref(); return self; }
+- initWithImpl:(DOM::ProcessingInstructionImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
- (DOM::ProcessingInstructionImpl *)impl { return (DOM::ProcessingInstructionImpl *)impl; }
-- (void)dealloc { [self impl]->deref(); [super dealloc]; }
@end
diff --git a/WebCore/kwq/WebDOMDocument.h b/WebCore/kwq/WebDOMDocument.h
index 03767fc..9530c5a 100644
--- a/WebCore/kwq/WebDOMDocument.h
+++ b/WebCore/kwq/WebDOMDocument.h
@@ -82,9 +82,7 @@
- (id<WebDOMAttr>)createAttribute:(NSString *)name;
-/*
- (id<WebDOMAttr>)createAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName;
-*/
- (id<WebDOMEntityReference>)createEntityReference:(NSString *)name;
diff --git a/WebCore/kwq/WebDOMElement.h b/WebCore/kwq/WebDOMElement.h
index 50188bb..a821fee 100644
--- a/WebCore/kwq/WebDOMElement.h
+++ b/WebCore/kwq/WebDOMElement.h
@@ -1,5 +1,5 @@
/*
- WebDOMElement.m
+ WebDOMElement.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -88,7 +88,7 @@
- (void)removeAttribute:(NSString *)name;
-- (id<WebDOMAttr>)getAttributeNodeNamed:(NSString *)name;
+- (id<WebDOMAttr>)getAttributeNode:(NSString *)name;
- (id<WebDOMAttr>)setAttributeNode:(id<WebDOMAttr>)newAttr;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d8a6510..95fe289 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-08 Richard Williamson <rjw at apple.com>
+
+ Made getAttributeNodeNamed match spec, changed
+ to getAttributeNode.
+
+ * DOM.subproj/WebDOMElement.h:
+
2002-10-08 John Sullivan <sullivan at apple.com>
- WebKit part of fix for 3069150 -- eliminate "separator"
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d8a6510..95fe289 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-08 Richard Williamson <rjw at apple.com>
+
+ Made getAttributeNodeNamed match spec, changed
+ to getAttributeNode.
+
+ * DOM.subproj/WebDOMElement.h:
+
2002-10-08 John Sullivan <sullivan at apple.com>
- WebKit part of fix for 3069150 -- eliminate "separator"
diff --git a/WebKit/DOM.subproj/WebDOMElement.h b/WebKit/DOM.subproj/WebDOMElement.h
index 50188bb..998b479 100644
--- a/WebKit/DOM.subproj/WebDOMElement.h
+++ b/WebKit/DOM.subproj/WebDOMElement.h
@@ -88,7 +88,7 @@
- (void)removeAttribute:(NSString *)name;
-- (id<WebDOMAttr>)getAttributeNodeNamed:(NSString *)name;
+- (id<WebDOMAttr>)getAttributeNode:(NSString *)name;
- (id<WebDOMAttr>)setAttributeNode:(id<WebDOMAttr>)newAttr;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index c6ac478..8f831ab 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -2130,8 +2130,6 @@
F57D194C034E734901A80180,
F57D194D034E734901A80180,
F57D194E034E734901A80180,
- F57D194F034E734901A80180,
- F57D1950034E734901A80180,
F57D1951034E734901A80180,
F57D1952034E734901A80180,
);
@@ -2167,20 +2165,6 @@
path = DOM.subproj/WebDOMElement.m;
refType = 2;
};
- F57D194F034E734901A80180 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- name = WebDOMNamedNodeMap.h;
- path = DOM.subproj/WebDOMNamedNodeMap.h;
- refType = 2;
- };
- F57D1950034E734901A80180 = {
- fileEncoding = 4;
- isa = PBXFileReference;
- name = WebDOMNamedNodeMap.m;
- path = DOM.subproj/WebDOMNamedNodeMap.m;
- refType = 2;
- };
F57D1951034E734901A80180 = {
fileEncoding = 4;
isa = PBXFileReference;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list