[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:50:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 68e88c96d18193f4efa55e8a2459d0c9cde6af66
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 16 01:42:49 2002 +0000
* kwq/WebCoreBridge.mm:
(attributedString):
Don't convert element unless it has a renderer.
* kwq/WebCoreDOMNode.mm:
(-[WebCoreDOMAttr DOM::]):
(-[WebCoreDOMAttr name]):
(-[WebCoreDOMAttr specified]):
(-[WebCoreDOMAttr value]):
(-[WebCoreDOMAttr ownerElement]):
(-[WebCoreDOMElement tagName]):
(-[WebCoreDOMElement setAttribute::]):
(-[WebCoreDOMElement removeAttribute:]):
(-[WebCoreDOMElement getAttributeNode:]):
(-[WebCoreDOMElement removeAttributeNode:]):
(-[WebCoreDOMElement getElementsByTagName:]):
(-[WebCoreDOMElement getAttributeNS::]):
(-[WebCoreDOMElement setAttributeNS:::]):
(-[WebCoreDOMCharacterData data]):
(-[WebCoreDOMCharacterData setData:]):
(-[WebCoreDOMCharacterData length]):
(-[WebCoreDOMCharacterData substringData::]):
(-[WebCoreDOMCharacterData appendData:]):
(-[WebCoreDOMCharacterData insertData::]):
(-[WebCoreDOMCharacterData deleteData::]):
(-[WebCoreDOMText splitText:]):
(-[WebCoreDOMProcessingInstruction data]):
(-[WebCoreDOMProcessingInstruction setData:]):
* kwq/WebCoreDOMPrivate.h:
API cleanup.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2338 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index bb4ee31..a35b6dc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,36 @@
+2002-10-15 Richard Williamson <rjw at apple.com>
+
+ * kwq/WebCoreBridge.mm:
+ (attributedString):
+ Don't convert element unless it has a renderer.
+
+ * kwq/WebCoreDOMNode.mm:
+ (-[WebCoreDOMAttr DOM::]):
+ (-[WebCoreDOMAttr name]):
+ (-[WebCoreDOMAttr specified]):
+ (-[WebCoreDOMAttr value]):
+ (-[WebCoreDOMAttr ownerElement]):
+ (-[WebCoreDOMElement tagName]):
+ (-[WebCoreDOMElement setAttribute::]):
+ (-[WebCoreDOMElement removeAttribute:]):
+ (-[WebCoreDOMElement getAttributeNode:]):
+ (-[WebCoreDOMElement removeAttributeNode:]):
+ (-[WebCoreDOMElement getElementsByTagName:]):
+ (-[WebCoreDOMElement getAttributeNS::]):
+ (-[WebCoreDOMElement setAttributeNS:::]):
+ (-[WebCoreDOMCharacterData data]):
+ (-[WebCoreDOMCharacterData setData:]):
+ (-[WebCoreDOMCharacterData length]):
+ (-[WebCoreDOMCharacterData substringData::]):
+ (-[WebCoreDOMCharacterData appendData:]):
+ (-[WebCoreDOMCharacterData insertData::]):
+ (-[WebCoreDOMCharacterData deleteData::]):
+ (-[WebCoreDOMText splitText:]):
+ (-[WebCoreDOMProcessingInstruction data]):
+ (-[WebCoreDOMProcessingInstruction setData:]):
+ * kwq/WebCoreDOMPrivate.h:
+ API cleanup.
+
2002-10-15 David Hyatt <hyatt at apple.com>
More work on making blocks correctly compute their maximal
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bb4ee31..a35b6dc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,36 @@
+2002-10-15 Richard Williamson <rjw at apple.com>
+
+ * kwq/WebCoreBridge.mm:
+ (attributedString):
+ Don't convert element unless it has a renderer.
+
+ * kwq/WebCoreDOMNode.mm:
+ (-[WebCoreDOMAttr DOM::]):
+ (-[WebCoreDOMAttr name]):
+ (-[WebCoreDOMAttr specified]):
+ (-[WebCoreDOMAttr value]):
+ (-[WebCoreDOMAttr ownerElement]):
+ (-[WebCoreDOMElement tagName]):
+ (-[WebCoreDOMElement setAttribute::]):
+ (-[WebCoreDOMElement removeAttribute:]):
+ (-[WebCoreDOMElement getAttributeNode:]):
+ (-[WebCoreDOMElement removeAttributeNode:]):
+ (-[WebCoreDOMElement getElementsByTagName:]):
+ (-[WebCoreDOMElement getAttributeNS::]):
+ (-[WebCoreDOMElement setAttributeNS:::]):
+ (-[WebCoreDOMCharacterData data]):
+ (-[WebCoreDOMCharacterData setData:]):
+ (-[WebCoreDOMCharacterData length]):
+ (-[WebCoreDOMCharacterData substringData::]):
+ (-[WebCoreDOMCharacterData appendData:]):
+ (-[WebCoreDOMCharacterData insertData::]):
+ (-[WebCoreDOMCharacterData deleteData::]):
+ (-[WebCoreDOMText splitText:]):
+ (-[WebCoreDOMProcessingInstruction data]):
+ (-[WebCoreDOMProcessingInstruction setData:]):
+ * kwq/WebCoreDOMPrivate.h:
+ API cleanup.
+
2002-10-15 David Hyatt <hyatt at apple.com>
More work on making blocks correctly compute their maximal
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bb4ee31..a35b6dc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,36 @@
+2002-10-15 Richard Williamson <rjw at apple.com>
+
+ * kwq/WebCoreBridge.mm:
+ (attributedString):
+ Don't convert element unless it has a renderer.
+
+ * kwq/WebCoreDOMNode.mm:
+ (-[WebCoreDOMAttr DOM::]):
+ (-[WebCoreDOMAttr name]):
+ (-[WebCoreDOMAttr specified]):
+ (-[WebCoreDOMAttr value]):
+ (-[WebCoreDOMAttr ownerElement]):
+ (-[WebCoreDOMElement tagName]):
+ (-[WebCoreDOMElement setAttribute::]):
+ (-[WebCoreDOMElement removeAttribute:]):
+ (-[WebCoreDOMElement getAttributeNode:]):
+ (-[WebCoreDOMElement removeAttributeNode:]):
+ (-[WebCoreDOMElement getElementsByTagName:]):
+ (-[WebCoreDOMElement getAttributeNS::]):
+ (-[WebCoreDOMElement setAttributeNS:::]):
+ (-[WebCoreDOMCharacterData data]):
+ (-[WebCoreDOMCharacterData setData:]):
+ (-[WebCoreDOMCharacterData length]):
+ (-[WebCoreDOMCharacterData substringData::]):
+ (-[WebCoreDOMCharacterData appendData:]):
+ (-[WebCoreDOMCharacterData insertData::]):
+ (-[WebCoreDOMCharacterData deleteData::]):
+ (-[WebCoreDOMText splitText:]):
+ (-[WebCoreDOMProcessingInstruction data]):
+ (-[WebCoreDOMProcessingInstruction setData:]):
+ * kwq/WebCoreDOMPrivate.h:
+ API cleanup.
+
2002-10-15 David Hyatt <hyatt at apple.com>
More work on making blocks correctly compute their maximal
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index ce284f0..e7fb05e 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -567,26 +567,26 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
bool hasNewLine = true;
DOM::Node n = _startNode;
khtml::RenderObject *renderer;
- khtml::RenderStyle *style;
NSFont *font;
NSMutableAttributedString *result = [[[NSMutableAttributedString alloc] init] autorelease];
NSAttributedString *partialString;
- NSColor *color;
while(!n.isNull()) {
- if(n.nodeType() == DOM::Node::TEXT_NODE) {
+ renderer = n.handle()->renderer();
+ if(n.nodeType() == DOM::Node::TEXT_NODE && renderer != 0) {
QString text;
QString str = n.nodeValue().string();
+ khtml::RenderStyle *style = 0;
- renderer = n.handle()->renderer();
font = nil;
if (renderer){
style = renderer->style();
if (style) {
font = style->font().getNSFont();
- color = style->color().getNSColor();
}
}
+ else
+ printf ("No renderer for %s\n", [text.getNSString() cString]);
hasNewLine = false;
if(n == _startNode && n == endNode && startOffset >=0 && endOffset >= 0)
@@ -598,15 +598,22 @@ static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int start
else
text = str;
- if (font)
- partialString = [[NSAttributedString alloc] initWithString: text.getNSString() attributes: [NSDictionary dictionaryWithObjectsAndKeys: font, NSFontAttributeName, color, NSForegroundColorAttributeName, 0]];
+ if (font){
+ NSMutableDictionary *attrs = [[[NSMutableDictionary alloc] init] autorelease];
+ [attrs setObject:font forKey:NSFontAttributeName];
+ if (style && style->color().isValid())
+ [attrs setObject:style->color().getNSColor() forKey:NSForegroundColorAttributeName];
+ if (style && style->backgroundColor().isValid())
+ [attrs setObject:style->backgroundColor().getNSColor() forKey:NSBackgroundColorAttributeName];
+ partialString = [[NSAttributedString alloc] initWithString: text.getNSString() attributes: attrs];
+ }
else
partialString = [[NSAttributedString alloc] initWithString: text.getNSString() attributes: nil];
[result appendAttributedString: partialString];
[partialString release];
}
- else {
+ else if (renderer != 0){
// This is our simple HTML -> ASCII transformation:
QString text;
unsigned short _id = n.elementId();
diff --git a/WebCore/kwq/WebCoreDOMNode.mm b/WebCore/kwq/WebCoreDOMNode.mm
index 0f155e5..3defe67 100644
--- a/WebCore/kwq/WebCoreDOMNode.mm
+++ b/WebCore/kwq/WebCoreDOMNode.mm
@@ -386,31 +386,26 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
return [[(WebCoreDOMAttr *)[[self class] alloc] initWithImpl: _impl] autorelease];
}
-- initWithImpl:(DOM::AttrImpl *)coreImpl
-{
- return [super initWithImpl:coreImpl];
-}
-
-- (DOM::AttrImpl *)impl
+- (DOM::AttrImpl *)attrImpl
{
return (DOM::AttrImpl *)impl;
}
- (NSString *)name
{
- DOM::Attr instance = DOM::AttrImpl::createInstance([self impl]);
+ DOM::Attr instance = DOM::AttrImpl::createInstance([self attrImpl]);
DOM::DOMString _name = instance.name();
return domStringToNSString(_name);
}
- (BOOL)specified
{
- return [self impl]->specified();
+ return [self attrImpl]->specified();
}
- (NSString *)value
{
- DOM::Attr instance = DOM::AttrImpl::createInstance([self impl]);
+ DOM::Attr instance = DOM::AttrImpl::createInstance([self attrImpl]);
DOM::DOMString _value = instance.value();
return domStringToNSString(_value);
@@ -418,13 +413,13 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (void)setValue:(NSString *)value;
{
- DOM::Attr instance = DOM::AttrImpl::createInstance([self impl]);
+ DOM::Attr instance = DOM::AttrImpl::createInstance([self attrImpl]);
instance.setValue (NSStringToDOMString(value));
}
- (id<WebDOMElement>)ownerElement
{
- DOM::Attr instance = DOM::AttrImpl::createInstance([self impl]);
+ DOM::Attr instance = DOM::AttrImpl::createInstance([self attrImpl]);
return [WebCoreDOMElement elementWithImpl: (DOM::ElementImpl *)instance.ownerElement().handle()];
}
@@ -437,8 +432,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
{
return [[(WebCoreDOMDocumentFragment *)[[self class] alloc] initWithImpl: _impl] autorelease];
}
-- initWithImpl:(DOM::DocumentFragmentImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::DocumentFragmentImpl *)impl { return (DOM::DocumentFragmentImpl *)impl; }
+- (DOM::DocumentFragmentImpl *)documentFragmentImpl { return (DOM::DocumentFragmentImpl *)impl; }
// No additional methods.
@end
@@ -446,12 +440,11 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMElement
+ (WebCoreDOMElement *)elementWithImpl: (DOM::ElementImpl *)_impl { return [[(WebCoreDOMElement *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::ElementImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::ElementImpl *)impl { return (DOM::ElementImpl *)impl; }
+- (DOM::ElementImpl *)elementImpl { return (DOM::ElementImpl *)impl; }
- (NSString *)tagName
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::DOMString _tagName = instance.tagName();
return domStringToNSString(_tagName);
@@ -459,7 +452,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (NSString *)getAttribute: (NSString *)name;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::DOMString _attribute = instance.getAttribute(NSStringToDOMString(name));
return domStringToNSString(_attribute);
@@ -467,19 +460,19 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (void)setAttribute:(NSString *)name :(NSString *)value
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
instance.setAttribute(NSStringToDOMString(name), NSStringToDOMString(value));
}
- (void)removeAttribute:(NSString *)name
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
instance.removeAttribute(NSStringToDOMString(name));
}
- (id<WebDOMAttr>)getAttributeNode:(NSString *)name
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::Attr ret = instance.getAttributeNode(NSStringToDOMString(name));
return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
@@ -487,8 +480,8 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (id<WebDOMAttr>)setAttributeNode:(id<WebDOMAttr>)newAttr;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
- DOM::Attr _newAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)newAttr impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
+ DOM::Attr _newAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)newAttr attrImpl]);
DOM::Attr ret = instance.setAttributeNode(_newAttr);
return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
@@ -496,8 +489,8 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (id<WebDOMAttr>)removeAttributeNode:(id<WebDOMAttr>)oldAttr
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
- DOM::Attr _oldAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)oldAttr impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
+ DOM::Attr _oldAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)oldAttr attrImpl]);
DOM::Attr ret = instance.removeAttributeNode(_oldAttr);
return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
@@ -505,7 +498,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (id<WebDOMNodeList>)getElementsByTagName:(NSString *)name
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::NodeList ret = instance.getElementsByTagName(NSStringToDOMString(name));
return [WebCoreDOMNodeList nodeListWithImpl: (DOM::NodeListImpl *)ret.handle()];
@@ -513,7 +506,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (id<WebDOMNodeList>)getElementsByTagNameNS:(NSString *)namespaceURI :(NSString *)localName;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::NodeList ret = instance.getElementsByTagNameNS(NSStringToDOMString(namespaceURI),NSStringToDOMString(localName));
return [WebCoreDOMNodeList nodeListWithImpl: (DOM::NodeListImpl *)ret.handle()];
@@ -521,7 +514,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (NSString *)getAttributeNS:(NSString *)namespaceURI :(NSString *)localName
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::DOMString ret = instance.getAttributeNS(NSStringToDOMString(namespaceURI),NSStringToDOMString(localName));
return domStringToNSString(ret);
@@ -529,19 +522,19 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (void)setAttributeNS:(NSString *)namespaceURI :(NSString *)qualifiedName :(NSString *)value
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
instance.setAttributeNS(NSStringToDOMString(namespaceURI), NSStringToDOMString(qualifiedName), NSStringToDOMString(value));
}
- (void)removeAttributeNS:(NSString *)namespaceURI :(NSString *)localName;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
instance.removeAttributeNS(NSStringToDOMString(namespaceURI),NSStringToDOMString(localName));
}
- (id<WebDOMAttr>)getAttributeNodeNS:(NSString *)namespaceURI :(NSString *)localName;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
DOM::Attr ret = instance.getAttributeNodeNS(NSStringToDOMString(namespaceURI), NSStringToDOMString(localName));
return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
@@ -549,8 +542,8 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (id<WebDOMAttr>)setAttributeNodeNS:(id<WebDOMAttr>)newAttr;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
- DOM::Attr _newAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)newAttr impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
+ DOM::Attr _newAttr = DOM::AttrImpl::createInstance([(WebCoreDOMAttr *)newAttr attrImpl]);
DOM::Attr ret = instance.setAttributeNodeNS(_newAttr);
return [WebCoreDOMAttr attrWithImpl: (DOM::AttrImpl *)ret.handle()];
@@ -558,14 +551,14 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
- (BOOL)hasAttribute: (NSString *)name;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
return instance.hasAttribute (NSStringToDOMString(name));
}
- (BOOL)hasAttributeNS:(NSString *)namespaceURI :(NSString *)localName;
{
- DOM::Element instance = DOM::ElementImpl::createInstance([self impl]);
+ DOM::Element instance = DOM::ElementImpl::createInstance([self elementImpl]);
return instance.hasAttributeNS (NSStringToDOMString(namespaceURI), NSStringToDOMString(localName));
}
@@ -576,64 +569,62 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMEntityReference
+ (WebCoreDOMEntityReference *)entityReferenceWithImpl: (DOM::EntityReferenceImpl *)_impl { return [[(WebCoreDOMEntityReference *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::EntityReferenceImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::EntityReferenceImpl *)impl { return (DOM::EntityReferenceImpl *)impl; }
+- (DOM::EntityReferenceImpl *)entityReferenceImpl { return (DOM::EntityReferenceImpl *)impl; }
@end
@implementation WebCoreDOMCharacterData
+ (WebCoreDOMCharacterData *)commentWithImpl: (DOM::CharacterDataImpl *)_impl { return [[(WebCoreDOMCharacterData *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::CharacterDataImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::CharacterDataImpl *)impl { return (DOM::CharacterDataImpl *)impl; }
+- (DOM::CharacterDataImpl *)characterDataImpl { return (DOM::CharacterDataImpl *)impl; }
- (NSString *)data
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
DOM::DOMString data = instance.data();
return domStringToNSString(data);
}
- (void)setData: (NSString *)data
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
return instance.setData(NSStringToDOMString(data));
}
- (unsigned long)length
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
return instance.length();
}
- (NSString *)substringData: (unsigned long)offset :(unsigned long)count
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
DOM::DOMString substring = instance.substringData(offset,count);
return domStringToNSString(substring);
}
- (void)appendData:(NSString *)arg
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
instance.appendData(NSStringToDOMString(arg));
}
- (void)insertData:(unsigned long)offset :(NSString *)arg
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
instance.insertData(offset, NSStringToDOMString(arg));
}
- (void)deleteData:(unsigned long)offset :(unsigned long) count
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
instance.deleteData(offset, count);
}
- (void)replaceData:(unsigned long)offset :(unsigned long)count :(NSString *)arg;
{
- DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self impl]);
+ DOM::CharacterData instance = DOM::CharacterDataImpl::createInstance([self characterDataImpl]);
instance.replaceData(offset, count, NSStringToDOMString(arg));
}
@@ -642,8 +633,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMComment
+ (WebCoreDOMComment *)commentWithImpl: (DOM::CommentImpl *)_impl { return [[(WebCoreDOMComment *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::CommentImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::CommentImpl *)impl { return (DOM::CommentImpl *)impl; }
+- (DOM::CommentImpl *)commentImpl { return (DOM::CommentImpl *)impl; }
// No additional methods.
@@ -652,12 +642,11 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
@implementation WebCoreDOMText
+ (WebCoreDOMText *)textWithImpl: (DOM::TextImpl *)_impl { return [[(WebCoreDOMText *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::TextImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::TextImpl *)impl { return (DOM::TextImpl *)impl; }
+- (DOM::TextImpl *)textImpl { return (DOM::TextImpl *)impl; }
- (id<WebDOMText>)splitText: (unsigned long)offset
{
- DOM::Text instance = DOM::TextImpl::createInstance([self impl]);
+ DOM::Text instance = DOM::TextImpl::createInstance([self textImpl]);
return [WebCoreDOMText textWithImpl: (DOM::TextImpl *)instance.splitText(offset).handle()];
}
@@ -669,8 +658,7 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
{
return [[(WebCoreDOMCDATASection *)[[self class] alloc] initWithImpl: _impl] autorelease];
}
-- initWithImpl:(DOM::CDATASectionImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::CDATASectionImpl *)impl { return (DOM::CDATASectionImpl *)impl; }
+- (DOM::CDATASectionImpl *)CDATASectionImpl { return (DOM::CDATASectionImpl *)impl; }
// No additional methods.
@end
@@ -679,26 +667,25 @@ DOM::ProcessingInstruction DOM::ProcessingInstructionImpl::createInstance(Proces
+ (WebCoreDOMProcessingInstruction *)processingInstructionWithImpl: (DOM::ProcessingInstructionImpl *)_impl
{ return [[(WebCoreDOMProcessingInstruction *)[[self class] alloc] initWithImpl: _impl] autorelease]; }
-- initWithImpl:(DOM::ProcessingInstructionImpl *)coreImpl { return [super initWithImpl:coreImpl]; }
-- (DOM::ProcessingInstructionImpl *)impl { return (DOM::ProcessingInstructionImpl *)impl; }
+- (DOM::ProcessingInstructionImpl *)processingInstructionImpl { return (DOM::ProcessingInstructionImpl *)impl; }
- (NSString *)target;
{
- DOM::ProcessingInstruction instance = DOM::ProcessingInstructionImpl::createInstance([self impl]);
+ DOM::ProcessingInstruction instance = DOM::ProcessingInstructionImpl::createInstance([self processingInstructionImpl]);
DOM::DOMString data = instance.data();
return domStringToNSString(data);
}
- (NSString *)data
{
- DOM::ProcessingInstruction instance = DOM::ProcessingInstructionImpl::createInstance([self impl]);
+ DOM::ProcessingInstruction instance = DOM::ProcessingInstructionImpl::createInstance([self processingInstructionImpl]);
DOM::DOMString data = instance.data();
return domStringToNSString(data);
}
- (void)setData:(NSString *)data
{
- DOM::ProcessingInstruction instance = DOM::ProcessingInstructionImpl::createInstance([self impl]);
+ DOM::ProcessingInstruction instance = DOM::ProcessingInstructionImpl::createInstance([self processingInstructionImpl]);
return instance.setData(NSStringToDOMString(data));
}
diff --git a/WebCore/kwq/WebCoreDOMPrivate.h b/WebCore/kwq/WebCoreDOMPrivate.h
index a823ce0..c8810f1 100644
--- a/WebCore/kwq/WebCoreDOMPrivate.h
+++ b/WebCore/kwq/WebCoreDOMPrivate.h
@@ -44,20 +44,17 @@ extern DOM::DOMString NSStringToDOMString(NSString *aString);
@interface WebCoreDOMElement (CorePrivate)
+ (WebCoreDOMElement *)elementWithImpl: (DOM::ElementImpl *)impl;
-- initWithImpl: (DOM::ElementImpl *)coreImpl;
-- (DOM::ElementImpl *)impl;
+- (DOM::ElementImpl *)elementImpl;
@end
@interface WebCoreDOMAttr (CorePrivate)
+ (WebCoreDOMAttr *)attrWithImpl: (DOM::AttrImpl *)impl;
-- initWithImpl: (DOM::AttrImpl *)coreImpl;
-- (DOM::AttrImpl *)impl;
+- (DOM::AttrImpl *)attrImpl;
@end
@interface WebCoreDOMDocumentFragment (CorePrivate)
+ (WebCoreDOMDocumentFragment *)documentFragmentWithImpl: (DOM::DocumentFragmentImpl *)impl;
-- initWithImpl: (DOM::DocumentFragmentImpl *)coreImpl;
-- (DOM::DocumentFragmentImpl *)impl;
+- (DOM::DocumentFragmentImpl *)documentFragmentImpl;
@end
@interface WebCoreDOMCharacterData (CorePrivate)
@@ -68,32 +65,27 @@ extern DOM::DOMString NSStringToDOMString(NSString *aString);
@interface WebCoreDOMText (CorePrivate)
+ (WebCoreDOMText *)textWithImpl: (DOM::TextImpl *)impl;
-- initWithImpl: (DOM::TextImpl *)coreImpl;
-- (DOM::TextImpl *)impl;
+- (DOM::TextImpl *)textImpl;
@end
@interface WebCoreDOMComment (CorePrivate)
+ (WebCoreDOMComment *)commentWithImpl: (DOM::CommentImpl *)impl;
-- initWithImpl: (DOM::CommentImpl *)coreImpl;
-- (DOM::CommentImpl *)impl;
+- (DOM::CommentImpl *)commentImpl;
@end
@interface WebCoreDOMCDATASection (CorePrivate)
+ (WebCoreDOMCDATASection *)CDATASectionWithImpl: (DOM::CDATASectionImpl *)impl;
-- initWithImpl: (DOM::CDATASectionImpl *)coreImpl;
-- (DOM::CDATASectionImpl *)impl;
+- (DOM::CDATASectionImpl *)CDATASectionImpl;
@end
@interface WebCoreDOMProcessingInstruction (CorePrivate)
+ (WebCoreDOMProcessingInstruction *)processingInstructionWithImpl: (DOM::ProcessingInstructionImpl *)impl;
-- initWithImpl: (DOM::ProcessingInstructionImpl *)coreImpl;
-- (DOM::ProcessingInstructionImpl *)impl;
+- (DOM::ProcessingInstructionImpl *)processingInstructionImpl;
@end
@interface WebCoreDOMEntityReference (CorePrivate)
+ (WebCoreDOMEntityReference *)entityReferenceWithImpl: (DOM::EntityReferenceImpl *)impl;
-- initWithImpl: (DOM::EntityReferenceImpl *)coreImpl;
-- (DOM::EntityReferenceImpl *)impl;
+- (DOM::EntityReferenceImpl *)entityReferenceImpl;
@end
@interface WebCoreDOMNode (CorePrivate)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list