[webkit-changes] cvs commit: WebCore/kwq DOM-CSS.mm DOM.mm
DOMHTML.mm DOMInternal.mm KWQFontFamily.mm KWQKHTMLPart.mm
Darin
darin at opensource.apple.com
Mon Aug 29 14:29:33 PDT 2005
darin 05/08/29 14:29:32
Modified: . ChangeLog
khtml khtml_part.cpp
khtml/css css_valueimpl.cpp csshelper.cpp
cssstyleselector.cpp
khtml/dom dom_string.cpp dom_string.h
khtml/ecma domparser.cpp kjs_dom.cpp kjs_html.cpp
kjs_views.cpp xmlhttprequest.cpp
khtml/editing jsediting.cpp
remove_node_attribute_command.cpp
set_node_attribute_command.cpp
khtml/html html_blockimpl.cpp html_documentimpl.cpp
html_elementimpl.cpp html_formimpl.cpp
html_headimpl.cpp htmlfactory.cpp htmlparser.cpp
khtml/rendering render_line.cpp
khtml/xml dom2_eventsimpl.cpp dom_atomicstring.cpp
dom_atomicstring.h dom_docimpl.cpp dom_docimpl.h
dom_elementimpl.cpp dom_qname.cpp dom_textimpl.cpp
dom_xmlimpl.cpp xml_tokenizer.cpp
khtml/xsl xslt_processorimpl.cpp
kwq DOM-CSS.mm DOM.mm DOMHTML.mm DOMInternal.mm
KWQFontFamily.mm KWQKHTMLPart.mm
Log:
Rubber stamped by Maciej.
- renamed DOMString::implementation() to DOMString::impl()
and DOMString::impl to DOMString::m_impl
* khtml/css/css_valueimpl.cpp:
(DOM::CSSPrimitiveValueImpl::CSSPrimitiveValueImpl):
(DOM::CSSPrimitiveValueImpl::setStringValue):
* khtml/css/csshelper.cpp:
(khtml::parseURL):
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::matchRules):
(khtml::CSSRuleSet::addRule):
(khtml::CSSStyleSelector::applyProperty):
* khtml/dom/dom_string.cpp:
(DOM::DOMString::DOMString):
(DOM::DOMString::operator =):
(DOM::DOMString::operator += ):
(DOM::DOMString::insert):
(DOM::DOMString::operator []):
(DOM::DOMString::find):
(DOM::DOMString::length):
(DOM::DOMString::truncate):
(DOM::DOMString::remove):
(DOM::DOMString::substring):
(DOM::DOMString::split):
(DOM::DOMString::lower):
(DOM::DOMString::upper):
(DOM::DOMString::percentage):
(DOM::DOMString::unicode):
(DOM::DOMString::qstring):
(DOM::DOMString::toInt):
(DOM::DOMString::copy):
(DOM::DOMString::isEmpty):
(DOM::DOMString::toCoordsArray):
(DOM::DOMString::toLengthArray):
(DOM::DOMString::ascii):
(DOM::operator==):
* khtml/dom/dom_string.h:
(DOM::DOMString::DOMString):
(DOM::DOMString::~DOMString):
(DOM::DOMString::isNull):
(DOM::DOMString::impl):
* khtml/ecma/domparser.cpp:
(KJS::DOMParserProtoFunc::callAsFunction):
* khtml/ecma/kjs_dom.cpp:
(KJS::DOMNode::putValueProperty):
(KJS::DOMDocument::getValueProperty):
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::HTMLElement::classInfo):
(KJS::HTMLElement::getSetInfo):
* khtml/ecma/kjs_views.cpp:
(KJS::DOMAbstractViewFunc::callAsFunction):
* khtml/ecma/xmlhttprequest.cpp:
(KJS::XMLHttpRequest::getValueProperty):
* khtml/editing/jsediting.cpp:
(DOM::DocumentImpl::commandImp):
* khtml/editing/remove_node_attribute_command.cpp:
(khtml::RemoveNodeAttributeCommand::doUnapply):
* khtml/editing/set_node_attribute_command.cpp:
(khtml::SetNodeAttributeCommand::doApply):
(khtml::SetNodeAttributeCommand::doUnapply):
* khtml/html/html_blockimpl.cpp:
(HTMLHRElementImpl::parseMappedAttribute):
* khtml/html/html_documentimpl.cpp:
(DOM::addItemToMap):
(DOM::removeItemFromMap):
(DOM::HTMLDocumentImpl::hasNamedItem):
(DOM::HTMLDocumentImpl::hasDocExtraNamedItem):
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::nodeName):
(HTMLElementImpl::isRecognizedTagName):
(inlineTagList):
(blockTagList):
(HTMLElementImpl::inEitherTagList):
(HTMLElementImpl::inInlineTagList):
(HTMLElementImpl::inBlockTagList):
* khtml/html/html_formimpl.cpp:
(DOM::HTMLFormElementImpl::radioButtonChecked):
(DOM::HTMLFormElementImpl::removeFormElement):
(DOM::HTMLInputElementImpl::isKeyboardFocusable):
(DOM::HTMLInputElementImpl::setInputType):
* khtml/html/html_headimpl.cpp:
(HTMLScriptElementImpl::setText):
(HTMLTitleElementImpl::setText):
* khtml/html/htmlfactory.cpp:
(DOM::HTMLElementFactory::createHTMLElement):
* khtml/html/htmlparser.cpp:
(HTMLParser::getNode):
(HTMLParser::isHeaderTag):
(HTMLParser::isResidualStyleTag):
(HTMLParser::isAffectedByResidualStyle):
* khtml/khtml_part.cpp:
(KHTMLPart::findTextNext):
(KHTMLPart::selectionComputedStyle):
* khtml/rendering/render_line.cpp:
(khtml::EllipsisBox::paint):
* khtml/xml/dom2_eventsimpl.cpp:
(EventImpl::EventImpl):
(EventImpl::initEvent):
(KeyboardEventImpl::KeyboardEventImpl):
(KeyboardEventImpl::initKeyboardEvent):
(MutationEventImpl::MutationEventImpl):
(MutationEventImpl::initMutationEvent):
* khtml/xml/dom_atomicstring.cpp:
(DOM::AtomicString::equal):
* khtml/xml/dom_atomicstring.h:
(DOM::AtomicString::AtomicString):
(DOM::AtomicString::impl):
(DOM::AtomicString::equal):
* khtml/xml/dom_docimpl.cpp:
(DOMImplementationImpl::createDocument):
(DocumentImpl::impl):
(DocumentImpl::createEntityReference):
(DocumentImpl::importNode):
(DocumentImpl::createAttributeNS):
* khtml/xml/dom_docimpl.h:
(DOM::DocumentTypeImpl::impl):
* khtml/xml/dom_elementimpl.cpp:
(AttrImpl::AttrImpl):
(AttrImpl::setValue):
(AttrImpl::childrenChanged):
(ElementImpl::setAttribute):
(ElementImpl::getAttributeNS):
(ElementImpl::setAttributeNS):
(ElementImpl::removeAttributeNS):
(ElementImpl::getAttributeNodeNS):
(ElementImpl::hasAttributeNS):
(NamedAttrMapImpl::getNamedItemNS):
(NamedAttrMapImpl::removeNamedItemNS):
(StyledElementImpl::getMappedAttributeDecl):
(StyledElementImpl::setMappedAttributeDecl):
(StyledElementImpl::removeMappedAttributeDecl):
(NamedMappedAttrMapImpl::parseClassAttribute):
(StyledElementImpl::parseMappedAttribute):
(StyledElementImpl::addCSSLength):
* khtml/xml/dom_qname.cpp:
(DOM::QNameHash::hash):
(DOM::equalComponents):
(DOM::QualifiedName::QualifiedName):
* khtml/xml/dom_textimpl.cpp:
(CharacterDataImpl::CharacterDataImpl):
(CharacterDataImpl::setData):
(CharacterDataImpl::appendData):
(CharacterDataImpl::insertData):
(CharacterDataImpl::replaceData):
* khtml/xml/dom_xmlimpl.cpp:
(DOM::EntityImpl::EntityImpl):
(DOM::NotationImpl::NotationImpl):
(DOM::ProcessingInstructionImpl::ProcessingInstructionImpl):
(DOM::ProcessingInstructionImpl::setData):
(DOM::ProcessingInstructionImpl::checkStyleSheet):
* khtml/xml/xml_tokenizer.cpp:
(khtml::XMLTokenizer::startElement):
* khtml/xsl/xslt_processorimpl.cpp:
(DOM::XSLTProcessorImpl::documentFromXMLDocPtr):
* kwq/DOM-CSS.mm:
(-[DOMDocument getComputedStyle::]):
* kwq/DOM.mm:
(-[DOMNode setPrefix:]):
(-[DOMDocument implementation]):
(-[DOMDocument getComputedStyle::]):
(-[DOMDocument getOverrideStyle::]):
* kwq/DOMHTML.mm:
(-[DOMHTMLSelectElement setValue:]):
(-[DOMHTMLOptionElement setValue:]):
* kwq/DOMInternal.mm:
(DOMString::DOMString):
* kwq/KWQFontFamily.mm:
(KWQFontFamily::getNSFamily):
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::styleForSelectionStart):
Revision Changes Path
1.36 +175 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 29 Aug 2005 21:10:38 -0000 1.35
+++ ChangeLog 29 Aug 2005 21:29:06 -0000 1.36
@@ -1,3 +1,178 @@
+2005-08-29 Darin Adler <darin at apple.com>
+
+ Rubber stamped by Maciej.
+
+ - renamed DOMString::implementation() to DOMString::impl()
+ and DOMString::impl to DOMString::m_impl
+
+ * khtml/css/css_valueimpl.cpp:
+ (DOM::CSSPrimitiveValueImpl::CSSPrimitiveValueImpl):
+ (DOM::CSSPrimitiveValueImpl::setStringValue):
+ * khtml/css/csshelper.cpp:
+ (khtml::parseURL):
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::matchRules):
+ (khtml::CSSRuleSet::addRule):
+ (khtml::CSSStyleSelector::applyProperty):
+ * khtml/dom/dom_string.cpp:
+ (DOM::DOMString::DOMString):
+ (DOM::DOMString::operator =):
+ (DOM::DOMString::operator += ):
+ (DOM::DOMString::insert):
+ (DOM::DOMString::operator []):
+ (DOM::DOMString::find):
+ (DOM::DOMString::length):
+ (DOM::DOMString::truncate):
+ (DOM::DOMString::remove):
+ (DOM::DOMString::substring):
+ (DOM::DOMString::split):
+ (DOM::DOMString::lower):
+ (DOM::DOMString::upper):
+ (DOM::DOMString::percentage):
+ (DOM::DOMString::unicode):
+ (DOM::DOMString::qstring):
+ (DOM::DOMString::toInt):
+ (DOM::DOMString::copy):
+ (DOM::DOMString::isEmpty):
+ (DOM::DOMString::toCoordsArray):
+ (DOM::DOMString::toLengthArray):
+ (DOM::DOMString::ascii):
+ (DOM::operator==):
+ * khtml/dom/dom_string.h:
+ (DOM::DOMString::DOMString):
+ (DOM::DOMString::~DOMString):
+ (DOM::DOMString::isNull):
+ (DOM::DOMString::impl):
+ * khtml/ecma/domparser.cpp:
+ (KJS::DOMParserProtoFunc::callAsFunction):
+ * khtml/ecma/kjs_dom.cpp:
+ (KJS::DOMNode::putValueProperty):
+ (KJS::DOMDocument::getValueProperty):
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::KJS::HTMLElement::classInfo):
+ (KJS::HTMLElement::getSetInfo):
+ * khtml/ecma/kjs_views.cpp:
+ (KJS::DOMAbstractViewFunc::callAsFunction):
+ * khtml/ecma/xmlhttprequest.cpp:
+ (KJS::XMLHttpRequest::getValueProperty):
+ * khtml/editing/jsediting.cpp:
+ (DOM::DocumentImpl::commandImp):
+ * khtml/editing/remove_node_attribute_command.cpp:
+ (khtml::RemoveNodeAttributeCommand::doUnapply):
+ * khtml/editing/set_node_attribute_command.cpp:
+ (khtml::SetNodeAttributeCommand::doApply):
+ (khtml::SetNodeAttributeCommand::doUnapply):
+ * khtml/html/html_blockimpl.cpp:
+ (HTMLHRElementImpl::parseMappedAttribute):
+ * khtml/html/html_documentimpl.cpp:
+ (DOM::addItemToMap):
+ (DOM::removeItemFromMap):
+ (DOM::HTMLDocumentImpl::hasNamedItem):
+ (DOM::HTMLDocumentImpl::hasDocExtraNamedItem):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::nodeName):
+ (HTMLElementImpl::isRecognizedTagName):
+ (inlineTagList):
+ (blockTagList):
+ (HTMLElementImpl::inEitherTagList):
+ (HTMLElementImpl::inInlineTagList):
+ (HTMLElementImpl::inBlockTagList):
+ * khtml/html/html_formimpl.cpp:
+ (DOM::HTMLFormElementImpl::radioButtonChecked):
+ (DOM::HTMLFormElementImpl::removeFormElement):
+ (DOM::HTMLInputElementImpl::isKeyboardFocusable):
+ (DOM::HTMLInputElementImpl::setInputType):
+ * khtml/html/html_headimpl.cpp:
+ (HTMLScriptElementImpl::setText):
+ (HTMLTitleElementImpl::setText):
+ * khtml/html/htmlfactory.cpp:
+ (DOM::HTMLElementFactory::createHTMLElement):
+ * khtml/html/htmlparser.cpp:
+ (HTMLParser::getNode):
+ (HTMLParser::isHeaderTag):
+ (HTMLParser::isResidualStyleTag):
+ (HTMLParser::isAffectedByResidualStyle):
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::findTextNext):
+ (KHTMLPart::selectionComputedStyle):
+ * khtml/rendering/render_line.cpp:
+ (khtml::EllipsisBox::paint):
+ * khtml/xml/dom2_eventsimpl.cpp:
+ (EventImpl::EventImpl):
+ (EventImpl::initEvent):
+ (KeyboardEventImpl::KeyboardEventImpl):
+ (KeyboardEventImpl::initKeyboardEvent):
+ (MutationEventImpl::MutationEventImpl):
+ (MutationEventImpl::initMutationEvent):
+ * khtml/xml/dom_atomicstring.cpp:
+ (DOM::AtomicString::equal):
+ * khtml/xml/dom_atomicstring.h:
+ (DOM::AtomicString::AtomicString):
+ (DOM::AtomicString::impl):
+ (DOM::AtomicString::equal):
+ * khtml/xml/dom_docimpl.cpp:
+ (DOMImplementationImpl::createDocument):
+ (DocumentImpl::impl):
+ (DocumentImpl::createEntityReference):
+ (DocumentImpl::importNode):
+ (DocumentImpl::createAttributeNS):
+ * khtml/xml/dom_docimpl.h:
+ (DOM::DocumentTypeImpl::impl):
+ * khtml/xml/dom_elementimpl.cpp:
+ (AttrImpl::AttrImpl):
+ (AttrImpl::setValue):
+ (AttrImpl::childrenChanged):
+ (ElementImpl::setAttribute):
+ (ElementImpl::getAttributeNS):
+ (ElementImpl::setAttributeNS):
+ (ElementImpl::removeAttributeNS):
+ (ElementImpl::getAttributeNodeNS):
+ (ElementImpl::hasAttributeNS):
+ (NamedAttrMapImpl::getNamedItemNS):
+ (NamedAttrMapImpl::removeNamedItemNS):
+ (StyledElementImpl::getMappedAttributeDecl):
+ (StyledElementImpl::setMappedAttributeDecl):
+ (StyledElementImpl::removeMappedAttributeDecl):
+ (NamedMappedAttrMapImpl::parseClassAttribute):
+ (StyledElementImpl::parseMappedAttribute):
+ (StyledElementImpl::addCSSLength):
+ * khtml/xml/dom_qname.cpp:
+ (DOM::QNameHash::hash):
+ (DOM::equalComponents):
+ (DOM::QualifiedName::QualifiedName):
+ * khtml/xml/dom_textimpl.cpp:
+ (CharacterDataImpl::CharacterDataImpl):
+ (CharacterDataImpl::setData):
+ (CharacterDataImpl::appendData):
+ (CharacterDataImpl::insertData):
+ (CharacterDataImpl::replaceData):
+ * khtml/xml/dom_xmlimpl.cpp:
+ (DOM::EntityImpl::EntityImpl):
+ (DOM::NotationImpl::NotationImpl):
+ (DOM::ProcessingInstructionImpl::ProcessingInstructionImpl):
+ (DOM::ProcessingInstructionImpl::setData):
+ (DOM::ProcessingInstructionImpl::checkStyleSheet):
+ * khtml/xml/xml_tokenizer.cpp:
+ (khtml::XMLTokenizer::startElement):
+ * khtml/xsl/xslt_processorimpl.cpp:
+ (DOM::XSLTProcessorImpl::documentFromXMLDocPtr):
+ * kwq/DOM-CSS.mm:
+ (-[DOMDocument getComputedStyle::]):
+ * kwq/DOM.mm:
+ (-[DOMNode setPrefix:]):
+ (-[DOMDocument implementation]):
+ (-[DOMDocument getComputedStyle::]):
+ (-[DOMDocument getOverrideStyle::]):
+ * kwq/DOMHTML.mm:
+ (-[DOMHTMLSelectElement setValue:]):
+ (-[DOMHTMLOptionElement setValue:]):
+ * kwq/DOMInternal.mm:
+ (DOMString::DOMString):
+ * kwq/KWQFontFamily.mm:
+ (KWQFontFamily::getNSFamily):
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::styleForSelectionStart):
+
2005-08-29 Justin Garcia <justin.garcia at apple.com>
Reviewed by john
1.337 +2 -2 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- khtml_part.cpp 25 Aug 2005 23:13:40 -0000 1.336
+++ khtml_part.cpp 29 Aug 2005 21:29:07 -0000 1.337
@@ -2371,7 +2371,7 @@
if( (d->m_findNode->nodeType() == Node::TEXT_NODE || d->m_findNode->nodeType() == Node::CDATA_SECTION_NODE) && d->m_findNode->renderer() )
{
DOMString nodeText = d->m_findNode->nodeValue();
- DOMStringImpl *t = nodeText.implementation();
+ DOMStringImpl *t = nodeText.impl();
QConstString s(t->s, t->l);
int matchLen = 0;
@@ -5775,7 +5775,7 @@
styleElement->ref();
- styleElement->setAttribute(styleAttr, d->m_typingStyle->cssText().implementation(), exceptionCode);
+ styleElement->setAttribute(styleAttr, d->m_typingStyle->cssText().impl(), exceptionCode);
assert(exceptionCode == 0);
TextImpl *text = xmlDocImpl()->createEditingTextNode("");
1.76 +2 -2 WebCore/khtml/css/css_valueimpl.cpp
Index: css_valueimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/css_valueimpl.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- css_valueimpl.cpp 27 Aug 2005 00:14:18 -0000 1.75
+++ css_valueimpl.cpp 29 Aug 2005 21:29:09 -0000 1.76
@@ -766,7 +766,7 @@
CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type)
{
- m_value.string = str.implementation();
+ m_value.string = str.impl();
if(m_value.string) m_value.string->ref();
m_type = type;
}
@@ -950,7 +950,7 @@
}
if(stringType != CSSPrimitiveValue::CSS_IDENT)
{
- m_value.string = stringValue.implementation();
+ m_value.string = stringValue.impl();
m_value.string->ref();
m_type = stringType;
}
1.8 +1 -1 WebCore/khtml/css/csshelper.cpp
Index: csshelper.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/csshelper.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- csshelper.cpp 15 Apr 2002 23:41:38 -0000 1.7
+++ csshelper.cpp 29 Aug 2005 21:29:09 -0000 1.8
@@ -44,7 +44,7 @@
DOMString khtml::parseURL(const DOMString &url)
{
- DOMStringImpl* i = url.implementation();
+ DOMStringImpl* i = url.impl();
if(!i) return DOMString();
int o = 0;
1.202 +9 -9 WebCore/khtml/css/cssstyleselector.cpp
Index: cssstyleselector.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- cssstyleselector.cpp 27 Aug 2005 00:14:18 -0000 1.201
+++ cssstyleselector.cpp 29 Aug 2005 21:29:09 -0000 1.202
@@ -332,15 +332,15 @@
// We need to collect the rules for id, class, tag, and everything else into a buffer and
// then sort the buffer.
if (element->hasID())
- matchRulesForList(rules->getIDRules(element->getIDAttribute().implementation()),
+ matchRulesForList(rules->getIDRules(element->getIDAttribute().impl()),
firstRuleIndex, lastRuleIndex);
if (element->hasClass()) {
for (const AtomicStringList* singleClass = element->getClassList();
singleClass; singleClass = singleClass->next())
- matchRulesForList(rules->getClassRules(singleClass->qstring().implementation()),
+ matchRulesForList(rules->getClassRules(singleClass->qstring().impl()),
firstRuleIndex, lastRuleIndex);
}
- matchRulesForList(rules->getTagRules(element->localName().implementation()),
+ matchRulesForList(rules->getTagRules(element->localName().impl()),
firstRuleIndex, lastRuleIndex);
matchRulesForList(rules->getUniversalRules(), firstRuleIndex, lastRuleIndex);
@@ -1440,17 +1440,17 @@
void CSSRuleSet::addRule(CSSStyleRuleImpl* rule, CSSSelector* sel)
{
if (sel->match == CSSSelector::Id) {
- addToRuleSet(sel->value.implementation(), m_idRules, rule, sel);
+ addToRuleSet(sel->value.impl(), m_idRules, rule, sel);
return;
}
if (sel->match == CSSSelector::Class) {
- addToRuleSet(sel->value.implementation(), m_classRules, rule, sel);
+ addToRuleSet(sel->value.impl(), m_classRules, rule, sel);
return;
}
const AtomicString& localName = sel->tag.localName();
if (localName != starAtom) {
- addToRuleSet(localName.implementation(), m_tagRules, rule, sel);
+ addToRuleSet(localName.impl(), m_tagRules, rule, sel);
return;
}
@@ -3082,11 +3082,11 @@
if (!item->isPrimitiveValue()) continue;
CSSPrimitiveValueImpl *val = static_cast<CSSPrimitiveValueImpl *>(item);
if (val->primitiveType()==CSSPrimitiveValue::CSS_STRING)
- style->setContent(val->getStringValue().implementation(), i != 0);
+ style->setContent(val->getStringValue().impl(), i != 0);
else if (val->primitiveType()==CSSPrimitiveValue::CSS_ATTR) {
// FIXME: Can a namespace be specified for an attr(foo)?
- QualifiedName attr(nullAtom, val->getStringValue().implementation(), nullAtom);
- style->setContent(element->getAttribute(attr).implementation(), i != 0);
+ QualifiedName attr(nullAtom, val->getStringValue().impl(), nullAtom);
+ style->setContent(element->getAttribute(attr).impl(), i != 0);
}
else if (val->primitiveType()==CSSPrimitiveValue::CSS_URI) {
CSSImageValueImpl *image = static_cast<CSSImageValueImpl *>(val);
1.20 +67 -67 WebCore/khtml/dom/dom_string.cpp
Index: dom_string.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_string.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dom_string.cpp 25 Aug 2005 17:46:59 -0000 1.19
+++ dom_string.cpp 29 Aug 2005 21:29:11 -0000 1.20
@@ -30,84 +30,84 @@
DOMString::DOMString(const QChar *str, uint len)
{
if (!str) {
- impl = 0;
+ m_impl = 0;
return;
}
if (len == 0)
- impl = DOMStringImpl::empty();
+ m_impl = DOMStringImpl::empty();
else
- impl = new DOMStringImpl(str, len);
- impl->ref();
+ m_impl = new DOMStringImpl(str, len);
+ m_impl->ref();
}
DOMString::DOMString(const QString &str)
{
if (str.isNull()) {
- impl = 0;
+ m_impl = 0;
return;
}
if (str.isEmpty())
- impl = DOMStringImpl::empty();
+ m_impl = DOMStringImpl::empty();
else
- impl = new DOMStringImpl(str.unicode(), str.length());
- impl->ref();
+ m_impl = new DOMStringImpl(str.unicode(), str.length());
+ m_impl->ref();
}
DOMString::DOMString(const char *str)
{
if (!str) {
- impl = 0;
+ m_impl = 0;
return;
}
int l = strlen(str);
if (l == 0)
- impl = DOMStringImpl::empty();
+ m_impl = DOMStringImpl::empty();
else
- impl = new DOMStringImpl(str, l);
- impl->ref();
+ m_impl = new DOMStringImpl(str, l);
+ m_impl->ref();
}
DOMString::DOMString(DOMStringImpl *i)
{
- impl = i;
- if(impl) impl->ref();
+ m_impl = i;
+ if(m_impl) m_impl->ref();
}
DOMString::DOMString(const DOMString &other)
{
- impl = other.impl;
- if(impl) impl->ref();
+ m_impl = other.m_impl;
+ if(m_impl) m_impl->ref();
}
DOMString &DOMString::operator =(const DOMString &other)
{
- if ( impl != other.impl ) {
- if(impl) impl->deref();
- impl = other.impl;
- if(impl) impl->ref();
+ if ( m_impl != other.m_impl ) {
+ if(m_impl) m_impl->deref();
+ m_impl = other.m_impl;
+ if(m_impl) m_impl->ref();
}
return *this;
}
DOMString &DOMString::operator += (const DOMString &str)
{
- if(str.impl)
+ if(str.m_impl)
{
- if(!impl)
+ if(!m_impl)
{
// ### FIXME!!!
- impl = str.impl;
- impl->ref();
+ m_impl = str.m_impl;
+ m_impl->ref();
return *this;
}
- DOMStringImpl *i = impl->copy();
- impl->deref();
- impl = i;
- impl->ref();
- impl->append(str.impl);
+ DOMStringImpl *i = m_impl->copy();
+ m_impl->deref();
+ m_impl = i;
+ m_impl->ref();
+ m_impl->append(str.m_impl);
}
return *this;
}
@@ -125,13 +125,13 @@
void DOMString::insert(DOMString str, uint pos)
{
- if(!impl)
+ if(!m_impl)
{
- impl = str.impl->copy();
- impl->ref();
+ m_impl = str.m_impl->copy();
+ m_impl->ref();
}
else
- impl->insert(str.impl, pos);
+ m_impl->insert(str.m_impl, pos);
}
@@ -139,18 +139,18 @@
{
static const QChar nullChar = 0;
- if(!impl || i >= impl->l ) return nullChar;
+ if(!m_impl || i >= m_impl->l ) return nullChar;
- return *(impl->s+i);
+ return *(m_impl->s+i);
}
int DOMString::find(const QChar c, int start) const
{
unsigned int l = start;
- if(!impl || l >= impl->l ) return -1;
- while( l < impl->l )
+ if(!m_impl || l >= m_impl->l ) return -1;
+ while( l < m_impl->l )
{
- if( *(impl->s+l) == c ) return l;
+ if( *(m_impl->s+l) == c ) return l;
l++;
}
return -1;
@@ -158,80 +158,80 @@
uint DOMString::length() const
{
- if(!impl) return 0;
- return impl->l;
+ if(!m_impl) return 0;
+ return m_impl->l;
}
void DOMString::truncate( unsigned int len )
{
- if(impl) impl->truncate(len);
+ if(m_impl) m_impl->truncate(len);
}
void DOMString::remove(unsigned int pos, int len)
{
- if(impl) impl->remove(pos, len);
+ if(m_impl) m_impl->remove(pos, len);
}
DOMString DOMString::substring(unsigned int pos, unsigned int len) const
{
- if (!impl)
+ if (!m_impl)
return DOMString();
- return impl->substring(pos, len);
+ return m_impl->substring(pos, len);
}
DOMString DOMString::split(unsigned int pos)
{
- if(!impl) return DOMString();
- return impl->split(pos);
+ if(!m_impl) return DOMString();
+ return m_impl->split(pos);
}
DOMString DOMString::lower() const
{
- if(!impl) return DOMString();
- return impl->lower();
+ if(!m_impl) return DOMString();
+ return m_impl->lower();
}
DOMString DOMString::upper() const
{
- if(!impl) return DOMString();
- return impl->upper();
+ if(!m_impl) return DOMString();
+ return m_impl->upper();
}
bool DOMString::percentage(int &_percentage) const
{
- if(!impl || !impl->l) return false;
+ if(!m_impl || !m_impl->l) return false;
- if ( *(impl->s+impl->l-1) != QChar('%'))
+ if ( *(m_impl->s+m_impl->l-1) != QChar('%'))
return false;
- _percentage = QConstString(impl->s, impl->l-1).qstring().toInt();
+ _percentage = QConstString(m_impl->s, m_impl->l-1).qstring().toInt();
return true;
}
QChar *DOMString::unicode() const
{
- if(!impl) return 0;
- return impl->s;
+ if(!m_impl) return 0;
+ return m_impl->s;
}
QString DOMString::qstring() const
{
- if(!impl) return QString::null;
+ if(!m_impl) return QString::null;
- return QString(impl->s, impl->l);
+ return QString(m_impl->s, m_impl->l);
}
int DOMString::toInt() const
{
- if(!impl) return 0;
+ if(!m_impl) return 0;
- return impl->toInt();
+ return m_impl->toInt();
}
DOMString DOMString::copy() const
{
- if(!impl) return DOMString();
- return impl->copy();
+ if(!m_impl) return DOMString();
+ return m_impl->copy();
}
// ------------------------------------------------------------------------
@@ -269,23 +269,23 @@
bool DOMString::isEmpty() const
{
- return (!impl || impl->l == 0);
+ return (!m_impl || m_impl->l == 0);
}
khtml::Length* DOMString::toCoordsArray(int& len) const
{
- return impl ? impl->toCoordsArray(len) : 0;
+ return m_impl ? m_impl->toCoordsArray(len) : 0;
}
khtml::Length* DOMString::toLengthArray(int& len) const
{
- return impl ? impl->toLengthArray(len) : 0;
+ return m_impl ? m_impl->toLengthArray(len) : 0;
}
#ifndef NDEBUG
const char *DOMString::ascii() const
{
- return impl ? impl->ascii() : "(null impl)";
+ return m_impl ? m_impl->ascii() : "(null impl)";
}
#endif
@@ -293,7 +293,7 @@
bool operator==( const DOMString &a, const DOMString &b )
{
- if (a.impl == b.impl)
+ if (a.m_impl == b.m_impl)
return true;
unsigned int l = a.length();
@@ -318,7 +318,7 @@
bool operator==( const DOMString &a, const char *b )
{
- DOMStringImpl *aimpl = a.impl;
+ DOMStringImpl *aimpl = a.m_impl;
if (!b)
return !aimpl;
1.15 +5 -5 WebCore/khtml/dom/dom_string.h
Index: dom_string.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/dom/dom_string.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dom_string.h 25 Aug 2005 17:46:59 -0000 1.14
+++ dom_string.h 29 Aug 2005 21:29:11 -0000 1.15
@@ -52,13 +52,13 @@
/**
* default constructor. Gives an empty DOMString
*/
- DOMString() : impl(0) { }
+ DOMString() : m_impl(0) { }
DOMString(const QChar *str, uint len);
DOMString(const QString &);
DOMString(const char *str);
DOMString(DOMStringImpl *i);
- ~DOMString() { if(impl) impl->deref(); }
+ ~DOMString() { if(m_impl) m_impl->deref(); }
// assign and copy
@@ -110,14 +110,14 @@
DOMString copy() const;
- bool isNull() const { return (impl == 0); }
+ bool isNull() const { return (m_impl == 0); }
bool isEmpty() const;
/**
* @internal get a handle to the imlementation of the DOMString
* Use at own risk!!!
*/
- DOMStringImpl *implementation() const { return impl; }
+ DOMStringImpl *impl() const { return m_impl; }
#ifdef __OBJC__
DOMString(NSString *);
@@ -130,7 +130,7 @@
#endif
protected:
- DOMStringImpl *impl;
+ DOMStringImpl *m_impl;
};
DOMString operator + (const DOMString &a, const DOMString &b);
1.6 +1 -1 WebCore/khtml/ecma/domparser.cpp
Index: domparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/domparser.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- domparser.cpp 26 Aug 2005 19:14:27 -0000 1.5
+++ domparser.cpp 29 Aug 2005 21:29:12 -0000 1.6
@@ -85,7 +85,7 @@
QString contentType = args[1]->toString(exec).qstring().stripWhiteSpace();
if (contentType == "text/xml" || contentType == "application/xml" || contentType == "application/xhtml+xml") {
- DocumentImpl *docImpl = parser->doc->implementation()->createDocument();
+ DocumentImpl *docImpl = parser->doc->impl()->createDocument();
docImpl->open();
docImpl->write(str);
1.93 +2 -2 WebCore/khtml/ecma/kjs_dom.cpp
Index: kjs_dom.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_dom.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kjs_dom.cpp 29 Aug 2005 17:42:42 -0000 1.92
+++ kjs_dom.cpp 29 Aug 2005 21:29:12 -0000 1.93
@@ -458,7 +458,7 @@
node.setNodeValue(value->toString(exec).domString(), exception);
break;
case Prefix:
- node.setPrefix(value->toString(exec).domString().implementation(), exception);
+ node.setPrefix(value->toString(exec).domString().impl(), exception);
break;
case OnAbort:
setListener(exec,DOM::EventImpl::ABORT_EVENT,value);
@@ -950,7 +950,7 @@
case DocType:
return getDOMNode(exec,doc.doctype());
case Implementation:
- return getDOMDOMImplementation(exec,doc.implementation());
+ return getDOMDOMImplementation(exec,doc.impl());
case DocumentElement:
return getDOMNode(exec,doc.documentElement());
case StyleSheets:
1.138 +132 -132 WebCore/khtml/ecma/kjs_html.cpp
Index: kjs_html.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_html.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kjs_html.cpp 25 Aug 2005 23:13:41 -0000 1.137
+++ kjs_html.cpp 29 Aug 2005 21:29:12 -0000 1.138
@@ -566,75 +566,75 @@
// FIXME: We want to use HashMap here, but there are compiler issues to deal with.
static QPtrDict<const ClassInfo> classInfoDict;
if (classInfoDict.isEmpty()) {
- classInfoDict.insert(aTag.localName().implementation(), &a_info);
- classInfoDict.insert(appletTag.localName().implementation(), &applet_info);
- classInfoDict.insert(areaTag.localName().implementation(), &area_info);
- classInfoDict.insert(baseTag.localName().implementation(), &base_info);
- classInfoDict.insert(basefontTag.localName().implementation(), &baseFont_info);
- classInfoDict.insert(blockquoteTag.localName().implementation(), &blockQuote_info);
- classInfoDict.insert(bodyTag.localName().implementation(), &body_info);
- classInfoDict.insert(brTag.localName().implementation(), &br_info);
- classInfoDict.insert(buttonTag.localName().implementation(), &button_info);
- classInfoDict.insert(canvasTag.localName().implementation(), &canvas_info);
- classInfoDict.insert(captionTag.localName().implementation(), &caption_info);
- classInfoDict.insert(colTag.localName().implementation(), &col_info);
- classInfoDict.insert(colgroupTag.localName().implementation(), &col_info);
- classInfoDict.insert(delTag.localName().implementation(), &mod_info);
- classInfoDict.insert(dirTag.localName().implementation(), &dir_info);
- classInfoDict.insert(divTag.localName().implementation(), &div_info);
- classInfoDict.insert(dlTag.localName().implementation(), &dl_info);
- classInfoDict.insert(fieldsetTag.localName().implementation(), &fieldSet_info);
- classInfoDict.insert(fontTag.localName().implementation(), &font_info);
- classInfoDict.insert(formTag.localName().implementation(), &form_info);
- classInfoDict.insert(frameTag.localName().implementation(), &frame_info);
- classInfoDict.insert(framesetTag.localName().implementation(), &frameSet_info);
- classInfoDict.insert(h1Tag.localName().implementation(), &heading_info);
- classInfoDict.insert(h2Tag.localName().implementation(), &heading_info);
- classInfoDict.insert(h3Tag.localName().implementation(), &heading_info);
- classInfoDict.insert(h4Tag.localName().implementation(), &heading_info);
- classInfoDict.insert(h5Tag.localName().implementation(), &heading_info);
- classInfoDict.insert(h6Tag.localName().implementation(), &heading_info);
- classInfoDict.insert(headTag.localName().implementation(), &head_info);
- classInfoDict.insert(hrTag.localName().implementation(), &hr_info);
- classInfoDict.insert(htmlTag.localName().implementation(), &html_info);
- classInfoDict.insert(iframeTag.localName().implementation(), &iFrame_info);
- classInfoDict.insert(imgTag.localName().implementation(), &img_info);
- classInfoDict.insert(inputTag.localName().implementation(), &input_info);
- classInfoDict.insert(insTag.localName().implementation(), &mod_info);
- classInfoDict.insert(isindexTag.localName().implementation(), &isIndex_info);
- classInfoDict.insert(labelTag.localName().implementation(), &label_info);
- classInfoDict.insert(legendTag.localName().implementation(), &legend_info);
- classInfoDict.insert(liTag.localName().implementation(), &li_info);
- classInfoDict.insert(linkTag.localName().implementation(), &link_info);
- classInfoDict.insert(mapTag.localName().implementation(), &map_info);
- classInfoDict.insert(marqueeTag.localName().implementation(), &marquee_info);
- classInfoDict.insert(menuTag.localName().implementation(), &menu_info);
- classInfoDict.insert(metaTag.localName().implementation(), &meta_info);
- classInfoDict.insert(objectTag.localName().implementation(), &object_info);
- classInfoDict.insert(olTag.localName().implementation(), &ol_info);
- classInfoDict.insert(optionTag.localName().implementation(), &option_info);
- classInfoDict.insert(optgroupTag.localName().implementation(), &optGroup_info);
- classInfoDict.insert(pTag.localName().implementation(), &p_info);
- classInfoDict.insert(paramTag.localName().implementation(), ¶m_info);
- classInfoDict.insert(preTag.localName().implementation(), &pre_info);
- classInfoDict.insert(qTag.localName().implementation(), &q_info);
- classInfoDict.insert(scriptTag.localName().implementation(), &script_info);
- classInfoDict.insert(selectTag.localName().implementation(), &select_info);
- classInfoDict.insert(styleTag.localName().implementation(), &style_info);
- classInfoDict.insert(tableTag.localName().implementation(), &table_info);
- classInfoDict.insert(tbodyTag.localName().implementation(), &tablesection_info);
- classInfoDict.insert(tdTag.localName().implementation(), &tablecell_info);
- classInfoDict.insert(textareaTag.localName().implementation(), &textArea_info);
- classInfoDict.insert(thTag.localName().implementation(), &tablecell_info);
- classInfoDict.insert(theadTag.localName().implementation(), &tablesection_info);
- classInfoDict.insert(tfootTag.localName().implementation(), &tablesection_info);
- classInfoDict.insert(titleTag.localName().implementation(), &title_info);
- classInfoDict.insert(trTag.localName().implementation(), &tr_info);
- classInfoDict.insert(ulTag.localName().implementation(), &ul_info);
+ classInfoDict.insert(aTag.localName().impl(), &a_info);
+ classInfoDict.insert(appletTag.localName().impl(), &applet_info);
+ classInfoDict.insert(areaTag.localName().impl(), &area_info);
+ classInfoDict.insert(baseTag.localName().impl(), &base_info);
+ classInfoDict.insert(basefontTag.localName().impl(), &baseFont_info);
+ classInfoDict.insert(blockquoteTag.localName().impl(), &blockQuote_info);
+ classInfoDict.insert(bodyTag.localName().impl(), &body_info);
+ classInfoDict.insert(brTag.localName().impl(), &br_info);
+ classInfoDict.insert(buttonTag.localName().impl(), &button_info);
+ classInfoDict.insert(canvasTag.localName().impl(), &canvas_info);
+ classInfoDict.insert(captionTag.localName().impl(), &caption_info);
+ classInfoDict.insert(colTag.localName().impl(), &col_info);
+ classInfoDict.insert(colgroupTag.localName().impl(), &col_info);
+ classInfoDict.insert(delTag.localName().impl(), &mod_info);
+ classInfoDict.insert(dirTag.localName().impl(), &dir_info);
+ classInfoDict.insert(divTag.localName().impl(), &div_info);
+ classInfoDict.insert(dlTag.localName().impl(), &dl_info);
+ classInfoDict.insert(fieldsetTag.localName().impl(), &fieldSet_info);
+ classInfoDict.insert(fontTag.localName().impl(), &font_info);
+ classInfoDict.insert(formTag.localName().impl(), &form_info);
+ classInfoDict.insert(frameTag.localName().impl(), &frame_info);
+ classInfoDict.insert(framesetTag.localName().impl(), &frameSet_info);
+ classInfoDict.insert(h1Tag.localName().impl(), &heading_info);
+ classInfoDict.insert(h2Tag.localName().impl(), &heading_info);
+ classInfoDict.insert(h3Tag.localName().impl(), &heading_info);
+ classInfoDict.insert(h4Tag.localName().impl(), &heading_info);
+ classInfoDict.insert(h5Tag.localName().impl(), &heading_info);
+ classInfoDict.insert(h6Tag.localName().impl(), &heading_info);
+ classInfoDict.insert(headTag.localName().impl(), &head_info);
+ classInfoDict.insert(hrTag.localName().impl(), &hr_info);
+ classInfoDict.insert(htmlTag.localName().impl(), &html_info);
+ classInfoDict.insert(iframeTag.localName().impl(), &iFrame_info);
+ classInfoDict.insert(imgTag.localName().impl(), &img_info);
+ classInfoDict.insert(inputTag.localName().impl(), &input_info);
+ classInfoDict.insert(insTag.localName().impl(), &mod_info);
+ classInfoDict.insert(isindexTag.localName().impl(), &isIndex_info);
+ classInfoDict.insert(labelTag.localName().impl(), &label_info);
+ classInfoDict.insert(legendTag.localName().impl(), &legend_info);
+ classInfoDict.insert(liTag.localName().impl(), &li_info);
+ classInfoDict.insert(linkTag.localName().impl(), &link_info);
+ classInfoDict.insert(mapTag.localName().impl(), &map_info);
+ classInfoDict.insert(marqueeTag.localName().impl(), &marquee_info);
+ classInfoDict.insert(menuTag.localName().impl(), &menu_info);
+ classInfoDict.insert(metaTag.localName().impl(), &meta_info);
+ classInfoDict.insert(objectTag.localName().impl(), &object_info);
+ classInfoDict.insert(olTag.localName().impl(), &ol_info);
+ classInfoDict.insert(optionTag.localName().impl(), &option_info);
+ classInfoDict.insert(optgroupTag.localName().impl(), &optGroup_info);
+ classInfoDict.insert(pTag.localName().impl(), &p_info);
+ classInfoDict.insert(paramTag.localName().impl(), ¶m_info);
+ classInfoDict.insert(preTag.localName().impl(), &pre_info);
+ classInfoDict.insert(qTag.localName().impl(), &q_info);
+ classInfoDict.insert(scriptTag.localName().impl(), &script_info);
+ classInfoDict.insert(selectTag.localName().impl(), &select_info);
+ classInfoDict.insert(styleTag.localName().impl(), &style_info);
+ classInfoDict.insert(tableTag.localName().impl(), &table_info);
+ classInfoDict.insert(tbodyTag.localName().impl(), &tablesection_info);
+ classInfoDict.insert(tdTag.localName().impl(), &tablecell_info);
+ classInfoDict.insert(textareaTag.localName().impl(), &textArea_info);
+ classInfoDict.insert(thTag.localName().impl(), &tablecell_info);
+ classInfoDict.insert(theadTag.localName().impl(), &tablesection_info);
+ classInfoDict.insert(tfootTag.localName().impl(), &tablesection_info);
+ classInfoDict.insert(titleTag.localName().impl(), &title_info);
+ classInfoDict.insert(trTag.localName().impl(), &tr_info);
+ classInfoDict.insert(ulTag.localName().impl(), &ul_info);
}
HTMLElementImpl* element = static_cast<HTMLElementImpl*>(impl());
- const ClassInfo* result = classInfoDict.find(element->localName().implementation());
+ const ClassInfo* result = classInfoDict.find(element->localName().impl());
if (result)
return result;
return &info;
@@ -701,75 +701,75 @@
// FIXME: We want to use HashMap here, but there are compiler issues to deal with.
static QPtrDict<const HTMLElement::Accessors> getSetInfoDict;
if (getSetInfoDict.isEmpty()) {
- getSetInfoDict.insert(aTag.localName().implementation(), &a_accessors);
- getSetInfoDict.insert(appletTag.localName().implementation(), &applet_accessors);
- getSetInfoDict.insert(areaTag.localName().implementation(), &area_accessors);
- getSetInfoDict.insert(baseTag.localName().implementation(), &base_accessors);
- getSetInfoDict.insert(basefontTag.localName().implementation(), &baseFont_accessors);
- getSetInfoDict.insert(blockquoteTag.localName().implementation(), &blockQuote_accessors);
- getSetInfoDict.insert(bodyTag.localName().implementation(), &body_accessors);
- getSetInfoDict.insert(brTag.localName().implementation(), &br_accessors);
- getSetInfoDict.insert(buttonTag.localName().implementation(), &button_accessors);
- getSetInfoDict.insert(canvasTag.localName().implementation(), &canvas_accessors);
- getSetInfoDict.insert(captionTag.localName().implementation(), &caption_accessors);
- getSetInfoDict.insert(colTag.localName().implementation(), &col_accessors);
- getSetInfoDict.insert(colgroupTag.localName().implementation(), &col_accessors);
- getSetInfoDict.insert(delTag.localName().implementation(), &mod_accessors);
- getSetInfoDict.insert(dirTag.localName().implementation(), &dir_accessors);
- getSetInfoDict.insert(divTag.localName().implementation(), &div_accessors);
- getSetInfoDict.insert(dlTag.localName().implementation(), &dl_accessors);
- getSetInfoDict.insert(fieldsetTag.localName().implementation(), &fieldSet_accessors);
- getSetInfoDict.insert(fontTag.localName().implementation(), &font_accessors);
- getSetInfoDict.insert(formTag.localName().implementation(), &form_accessors);
- getSetInfoDict.insert(frameTag.localName().implementation(), &frame_accessors);
- getSetInfoDict.insert(framesetTag.localName().implementation(), &frameSet_accessors);
- getSetInfoDict.insert(h1Tag.localName().implementation(), &heading_accessors);
- getSetInfoDict.insert(h2Tag.localName().implementation(), &heading_accessors);
- getSetInfoDict.insert(h3Tag.localName().implementation(), &heading_accessors);
- getSetInfoDict.insert(h4Tag.localName().implementation(), &heading_accessors);
- getSetInfoDict.insert(h5Tag.localName().implementation(), &heading_accessors);
- getSetInfoDict.insert(h6Tag.localName().implementation(), &heading_accessors);
- getSetInfoDict.insert(headTag.localName().implementation(), &head_accessors);
- getSetInfoDict.insert(hrTag.localName().implementation(), &hr_accessors);
- getSetInfoDict.insert(htmlTag.localName().implementation(), &html_accessors);
- getSetInfoDict.insert(iframeTag.localName().implementation(), &iFrame_accessors);
- getSetInfoDict.insert(imgTag.localName().implementation(), &img_accessors);
- getSetInfoDict.insert(inputTag.localName().implementation(), &input_accessors);
- getSetInfoDict.insert(insTag.localName().implementation(), &mod_accessors);
- getSetInfoDict.insert(isindexTag.localName().implementation(), &isIndex_accessors);
- getSetInfoDict.insert(labelTag.localName().implementation(), &label_accessors);
- getSetInfoDict.insert(legendTag.localName().implementation(), &legend_accessors);
- getSetInfoDict.insert(liTag.localName().implementation(), &li_accessors);
- getSetInfoDict.insert(linkTag.localName().implementation(), &link_accessors);
- getSetInfoDict.insert(mapTag.localName().implementation(), &map_accessors);
- getSetInfoDict.insert(marqueeTag.localName().implementation(), &marquee_accessors);
- getSetInfoDict.insert(menuTag.localName().implementation(), &menu_accessors);
- getSetInfoDict.insert(metaTag.localName().implementation(), &meta_accessors);
- getSetInfoDict.insert(objectTag.localName().implementation(), &object_accessors);
- getSetInfoDict.insert(olTag.localName().implementation(), &ol_accessors);
- getSetInfoDict.insert(optionTag.localName().implementation(), &option_accessors);
- getSetInfoDict.insert(optgroupTag.localName().implementation(), &optGroup_accessors);
- getSetInfoDict.insert(pTag.localName().implementation(), &p_accessors);
- getSetInfoDict.insert(paramTag.localName().implementation(), ¶m_accessors);
- getSetInfoDict.insert(preTag.localName().implementation(), &pre_accessors);
- getSetInfoDict.insert(qTag.localName().implementation(), &q_accessors);
- getSetInfoDict.insert(scriptTag.localName().implementation(), &script_accessors);
- getSetInfoDict.insert(selectTag.localName().implementation(), &select_accessors);
- getSetInfoDict.insert(styleTag.localName().implementation(), &style_accessors);
- getSetInfoDict.insert(tableTag.localName().implementation(), &table_accessors);
- getSetInfoDict.insert(tbodyTag.localName().implementation(), &tablesection_accessors);
- getSetInfoDict.insert(tdTag.localName().implementation(), &tablecell_accessors);
- getSetInfoDict.insert(textareaTag.localName().implementation(), &textArea_accessors);
- getSetInfoDict.insert(thTag.localName().implementation(), &tablecell_accessors);
- getSetInfoDict.insert(theadTag.localName().implementation(), &tablesection_accessors);
- getSetInfoDict.insert(tfootTag.localName().implementation(), &tablesection_accessors);
- getSetInfoDict.insert(titleTag.localName().implementation(), &title_accessors);
- getSetInfoDict.insert(trTag.localName().implementation(), &tr_accessors);
- getSetInfoDict.insert(ulTag.localName().implementation(), &ul_accessors);
+ getSetInfoDict.insert(aTag.localName().impl(), &a_accessors);
+ getSetInfoDict.insert(appletTag.localName().impl(), &applet_accessors);
+ getSetInfoDict.insert(areaTag.localName().impl(), &area_accessors);
+ getSetInfoDict.insert(baseTag.localName().impl(), &base_accessors);
+ getSetInfoDict.insert(basefontTag.localName().impl(), &baseFont_accessors);
+ getSetInfoDict.insert(blockquoteTag.localName().impl(), &blockQuote_accessors);
+ getSetInfoDict.insert(bodyTag.localName().impl(), &body_accessors);
+ getSetInfoDict.insert(brTag.localName().impl(), &br_accessors);
+ getSetInfoDict.insert(buttonTag.localName().impl(), &button_accessors);
+ getSetInfoDict.insert(canvasTag.localName().impl(), &canvas_accessors);
+ getSetInfoDict.insert(captionTag.localName().impl(), &caption_accessors);
+ getSetInfoDict.insert(colTag.localName().impl(), &col_accessors);
+ getSetInfoDict.insert(colgroupTag.localName().impl(), &col_accessors);
+ getSetInfoDict.insert(delTag.localName().impl(), &mod_accessors);
+ getSetInfoDict.insert(dirTag.localName().impl(), &dir_accessors);
+ getSetInfoDict.insert(divTag.localName().impl(), &div_accessors);
+ getSetInfoDict.insert(dlTag.localName().impl(), &dl_accessors);
+ getSetInfoDict.insert(fieldsetTag.localName().impl(), &fieldSet_accessors);
+ getSetInfoDict.insert(fontTag.localName().impl(), &font_accessors);
+ getSetInfoDict.insert(formTag.localName().impl(), &form_accessors);
+ getSetInfoDict.insert(frameTag.localName().impl(), &frame_accessors);
+ getSetInfoDict.insert(framesetTag.localName().impl(), &frameSet_accessors);
+ getSetInfoDict.insert(h1Tag.localName().impl(), &heading_accessors);
+ getSetInfoDict.insert(h2Tag.localName().impl(), &heading_accessors);
+ getSetInfoDict.insert(h3Tag.localName().impl(), &heading_accessors);
+ getSetInfoDict.insert(h4Tag.localName().impl(), &heading_accessors);
+ getSetInfoDict.insert(h5Tag.localName().impl(), &heading_accessors);
+ getSetInfoDict.insert(h6Tag.localName().impl(), &heading_accessors);
+ getSetInfoDict.insert(headTag.localName().impl(), &head_accessors);
+ getSetInfoDict.insert(hrTag.localName().impl(), &hr_accessors);
+ getSetInfoDict.insert(htmlTag.localName().impl(), &html_accessors);
+ getSetInfoDict.insert(iframeTag.localName().impl(), &iFrame_accessors);
+ getSetInfoDict.insert(imgTag.localName().impl(), &img_accessors);
+ getSetInfoDict.insert(inputTag.localName().impl(), &input_accessors);
+ getSetInfoDict.insert(insTag.localName().impl(), &mod_accessors);
+ getSetInfoDict.insert(isindexTag.localName().impl(), &isIndex_accessors);
+ getSetInfoDict.insert(labelTag.localName().impl(), &label_accessors);
+ getSetInfoDict.insert(legendTag.localName().impl(), &legend_accessors);
+ getSetInfoDict.insert(liTag.localName().impl(), &li_accessors);
+ getSetInfoDict.insert(linkTag.localName().impl(), &link_accessors);
+ getSetInfoDict.insert(mapTag.localName().impl(), &map_accessors);
+ getSetInfoDict.insert(marqueeTag.localName().impl(), &marquee_accessors);
+ getSetInfoDict.insert(menuTag.localName().impl(), &menu_accessors);
+ getSetInfoDict.insert(metaTag.localName().impl(), &meta_accessors);
+ getSetInfoDict.insert(objectTag.localName().impl(), &object_accessors);
+ getSetInfoDict.insert(olTag.localName().impl(), &ol_accessors);
+ getSetInfoDict.insert(optionTag.localName().impl(), &option_accessors);
+ getSetInfoDict.insert(optgroupTag.localName().impl(), &optGroup_accessors);
+ getSetInfoDict.insert(pTag.localName().impl(), &p_accessors);
+ getSetInfoDict.insert(paramTag.localName().impl(), ¶m_accessors);
+ getSetInfoDict.insert(preTag.localName().impl(), &pre_accessors);
+ getSetInfoDict.insert(qTag.localName().impl(), &q_accessors);
+ getSetInfoDict.insert(scriptTag.localName().impl(), &script_accessors);
+ getSetInfoDict.insert(selectTag.localName().impl(), &select_accessors);
+ getSetInfoDict.insert(styleTag.localName().impl(), &style_accessors);
+ getSetInfoDict.insert(tableTag.localName().impl(), &table_accessors);
+ getSetInfoDict.insert(tbodyTag.localName().impl(), &tablesection_accessors);
+ getSetInfoDict.insert(tdTag.localName().impl(), &tablecell_accessors);
+ getSetInfoDict.insert(textareaTag.localName().impl(), &textArea_accessors);
+ getSetInfoDict.insert(thTag.localName().impl(), &tablecell_accessors);
+ getSetInfoDict.insert(theadTag.localName().impl(), &tablesection_accessors);
+ getSetInfoDict.insert(tfootTag.localName().impl(), &tablesection_accessors);
+ getSetInfoDict.insert(titleTag.localName().impl(), &title_accessors);
+ getSetInfoDict.insert(trTag.localName().impl(), &tr_accessors);
+ getSetInfoDict.insert(ulTag.localName().impl(), &ul_accessors);
}
HTMLElementImpl* element = static_cast<HTMLElementImpl*>(impl());
- const HTMLElement::Accessors* result = getSetInfoDict.find(element->localName().implementation());
+ const HTMLElement::Accessors* result = getSetInfoDict.find(element->localName().impl());
if (result)
return result;
return 0;
1.12 +1 -1 WebCore/khtml/ecma/kjs_views.cpp
Index: kjs_views.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_views.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kjs_views.cpp 25 Aug 2005 17:47:01 -0000 1.11
+++ kjs_views.cpp 29 Aug 2005 21:29:13 -0000 1.12
@@ -78,7 +78,7 @@
else {
if (DocumentImpl* doc = arg0->getDocument())
doc->updateLayoutIgnorePendingStylesheets();
- return getDOMCSSStyleDeclaration(exec, abstractView.getComputedStyle(arg0, args[1]->toString(exec).domString().implementation()));
+ return getDOMCSSStyleDeclaration(exec, abstractView.getComputedStyle(arg0, args[1]->toString(exec).domString().impl()));
}
}
}
1.41 +1 -1 WebCore/khtml/ecma/xmlhttprequest.cpp
Index: xmlhttprequest.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/xmlhttprequest.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xmlhttprequest.cpp 25 Aug 2005 17:47:02 -0000 1.40
+++ xmlhttprequest.cpp 29 Aug 2005 21:29:13 -0000 1.41
@@ -159,7 +159,7 @@
if (mimeType == "text/xml" || mimeType == "application/xml" || mimeType == "application/xhtml+xml" ||
mimeType == "text/xsl" || mimeType == "application/rss+xml" || mimeType == "application/atom+xml") {
- responseXML.reset(doc->implementation()->createDocument());
+ responseXML.reset(doc->impl()->createDocument());
DocumentImpl *docImpl = responseXML.get();
1.30 +1 -1 WebCore/khtml/editing/jsediting.cpp
Index: jsediting.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/jsediting.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jsediting.cpp 25 Aug 2005 17:47:05 -0000 1.29
+++ jsediting.cpp 29 Aug 2005 21:29:15 -0000 1.30
@@ -63,7 +63,7 @@
const CommandImp *commandImp(const DOMString &command)
{
static CommandMap *commandDictionary = createCommandDictionary();
- return commandDictionary->get(command.implementation());
+ return commandDictionary->get(command.impl());
}
} // anonymous namespace
1.3 +1 -1 WebCore/khtml/editing/remove_node_attribute_command.cpp
Index: remove_node_attribute_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/remove_node_attribute_command.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- remove_node_attribute_command.cpp 18 Jul 2005 21:44:18 -0000 1.2
+++ remove_node_attribute_command.cpp 29 Aug 2005 21:29:15 -0000 1.3
@@ -71,7 +71,7 @@
ASSERT(!m_oldValue.isNull());
int exceptionCode = 0;
- m_element->setAttribute(m_attribute, m_oldValue.implementation(), exceptionCode);
+ m_element->setAttribute(m_attribute, m_oldValue.impl(), exceptionCode);
ASSERT(exceptionCode == 0);
}
1.3 +2 -2 WebCore/khtml/editing/set_node_attribute_command.cpp
Index: set_node_attribute_command.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/editing/set_node_attribute_command.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- set_node_attribute_command.cpp 18 Jul 2005 21:44:18 -0000 1.2
+++ set_node_attribute_command.cpp 29 Aug 2005 21:29:15 -0000 1.3
@@ -63,7 +63,7 @@
int exceptionCode = 0;
m_oldValue = m_element->getAttribute(m_attribute);
- m_element->setAttribute(m_attribute, m_value.implementation(), exceptionCode);
+ m_element->setAttribute(m_attribute, m_value.impl(), exceptionCode);
ASSERT(exceptionCode == 0);
}
@@ -75,7 +75,7 @@
if (m_oldValue.isNull())
m_element->removeAttribute(m_attribute, exceptionCode);
else
- m_element->setAttribute(m_attribute, m_oldValue.implementation(), exceptionCode);
+ m_element->setAttribute(m_attribute, m_oldValue.impl(), exceptionCode);
ASSERT(exceptionCode == 0);
}
1.24 +2 -2 WebCore/khtml/html/html_blockimpl.cpp
Index: html_blockimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_blockimpl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- html_blockimpl.cpp 30 Jul 2005 02:33:17 -0000 1.23
+++ html_blockimpl.cpp 29 Aug 2005 21:29:16 -0000 1.24
@@ -142,7 +142,7 @@
}
} else if (attr->name() == widthAttr) {
bool ok;
- int v = attr->value().implementation()->toInt(&ok);
+ int v = attr->value().impl()->toInt(&ok);
if(ok && !v)
addCSSLength(attr, CSS_PROP_WIDTH, "1");
else
@@ -162,7 +162,7 @@
addCSSColor(attr, CSS_PROP_BORDER_COLOR, DOMString("grey"));
addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, DOMString("grey"));
} else if (attr->name() == sizeAttr) {
- DOMStringImpl* si = attr->value().implementation();
+ DOMStringImpl* si = attr->value().impl();
int size = si->toInt();
if (size <= 1)
addCSSProperty(attr, CSS_PROP_BORDER_BOTTOM_WIDTH, DOMString("0"));
1.69 +5 -5 WebCore/khtml/html/html_documentimpl.cpp
Index: html_documentimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- html_documentimpl.cpp 25 Aug 2005 23:13:48 -0000 1.68
+++ html_documentimpl.cpp 29 Aug 2005 21:29:16 -0000 1.69
@@ -271,9 +271,9 @@
if (name.length() == 0)
return;
- HTMLDocumentImpl::NameCountMap::iterator it = map.find(name.implementation());
+ HTMLDocumentImpl::NameCountMap::iterator it = map.find(name.impl());
if (it == map.end())
- map.insert(name.implementation(), 1);
+ map.insert(name.impl(), 1);
else
++(it->second);
}
@@ -283,7 +283,7 @@
if (name.length() == 0)
return;
- HTMLDocumentImpl::NameCountMap::iterator it = map.find(name.implementation());
+ HTMLDocumentImpl::NameCountMap::iterator it = map.find(name.impl());
if (it == map.end())
return;
@@ -308,7 +308,7 @@
bool HTMLDocumentImpl::hasNamedItem(const DOMString& name)
{
- return namedItemCounts.get(name.implementation()) != 0;
+ return namedItemCounts.get(name.impl()) != 0;
}
void HTMLDocumentImpl::addDocExtraNamedItem(const DOMString& name)
@@ -323,7 +323,7 @@
bool HTMLDocumentImpl::hasDocExtraNamedItem(const DOMString& name)
{
- return docExtraNamedItemCounts.get(name.implementation()) != 0;
+ return docExtraNamedItemCounts.get(name.impl()) != 0;
}
const int PARSEMODE_HAVE_DOCTYPE = (1<<0);
1.99 +85 -85 WebCore/khtml/html/html_elementimpl.cpp
Index: html_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- html_elementimpl.cpp 25 Aug 2005 23:13:48 -0000 1.98
+++ html_elementimpl.cpp 29 Aug 2005 21:29:17 -0000 1.99
@@ -73,7 +73,7 @@
// FIXME: Would be nice to have an atomicstring lookup based off uppercase chars that does not have to copy
// the string on a hit in the hash.
if (getDocument()->isHTMLDocument())
- return m_tagName.localName().implementation()->upper();
+ return m_tagName.localName().impl()->upper();
return ElementImpl::nodeName();
}
@@ -700,10 +700,10 @@
{
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > tagList;
if (tagList.isEmpty()) {
- #define INSERT_TAG(name) tagList.insert(name##Tag.localName().implementation());
+ #define INSERT_TAG(name) tagList.insert(name##Tag.localName().impl());
DOM_HTMLNAMES_FOR_EACH_TAG(INSERT_TAG)
}
- return tagList.contains(tagName.localName().implementation());
+ return tagList.contains(tagName.localName().impl());
}
// The terms inline and block are used here loosely. Don't make the mistake of assuming all inlines or all blocks
@@ -711,51 +711,51 @@
HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> >* inlineTagList() {
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > tagList;
if (tagList.isEmpty()) {
- tagList.insert(ttTag.localName().implementation());
- tagList.insert(iTag.localName().implementation());
- tagList.insert(bTag.localName().implementation());
- tagList.insert(uTag.localName().implementation());
- tagList.insert(sTag.localName().implementation());
- tagList.insert(strikeTag.localName().implementation());
- tagList.insert(bigTag.localName().implementation());
- tagList.insert(smallTag.localName().implementation());
- tagList.insert(emTag.localName().implementation());
- tagList.insert(strongTag.localName().implementation());
- tagList.insert(dfnTag.localName().implementation());
- tagList.insert(codeTag.localName().implementation());
- tagList.insert(sampTag.localName().implementation());
- tagList.insert(kbdTag.localName().implementation());
- tagList.insert(varTag.localName().implementation());
- tagList.insert(citeTag.localName().implementation());
- tagList.insert(abbrTag.localName().implementation());
- tagList.insert(acronymTag.localName().implementation());
- tagList.insert(aTag.localName().implementation());
- tagList.insert(canvasTag.localName().implementation());
- tagList.insert(imgTag.localName().implementation());
- tagList.insert(appletTag.localName().implementation());
- tagList.insert(objectTag.localName().implementation());
- tagList.insert(embedTag.localName().implementation());
- tagList.insert(fontTag.localName().implementation());
- tagList.insert(basefontTag.localName().implementation());
- tagList.insert(brTag.localName().implementation());
- tagList.insert(scriptTag.localName().implementation());
- tagList.insert(mapTag.localName().implementation());
- tagList.insert(qTag.localName().implementation());
- tagList.insert(subTag.localName().implementation());
- tagList.insert(supTag.localName().implementation());
- tagList.insert(spanTag.localName().implementation());
- tagList.insert(bdoTag.localName().implementation());
- tagList.insert(iframeTag.localName().implementation());
- tagList.insert(inputTag.localName().implementation());
- tagList.insert(keygenTag.localName().implementation());
- tagList.insert(selectTag.localName().implementation());
- tagList.insert(textareaTag.localName().implementation());
- tagList.insert(labelTag.localName().implementation());
- tagList.insert(buttonTag.localName().implementation());
- tagList.insert(insTag.localName().implementation());
- tagList.insert(delTag.localName().implementation());
- tagList.insert(nobrTag.localName().implementation());
- tagList.insert(wbrTag.localName().implementation());
+ tagList.insert(ttTag.localName().impl());
+ tagList.insert(iTag.localName().impl());
+ tagList.insert(bTag.localName().impl());
+ tagList.insert(uTag.localName().impl());
+ tagList.insert(sTag.localName().impl());
+ tagList.insert(strikeTag.localName().impl());
+ tagList.insert(bigTag.localName().impl());
+ tagList.insert(smallTag.localName().impl());
+ tagList.insert(emTag.localName().impl());
+ tagList.insert(strongTag.localName().impl());
+ tagList.insert(dfnTag.localName().impl());
+ tagList.insert(codeTag.localName().impl());
+ tagList.insert(sampTag.localName().impl());
+ tagList.insert(kbdTag.localName().impl());
+ tagList.insert(varTag.localName().impl());
+ tagList.insert(citeTag.localName().impl());
+ tagList.insert(abbrTag.localName().impl());
+ tagList.insert(acronymTag.localName().impl());
+ tagList.insert(aTag.localName().impl());
+ tagList.insert(canvasTag.localName().impl());
+ tagList.insert(imgTag.localName().impl());
+ tagList.insert(appletTag.localName().impl());
+ tagList.insert(objectTag.localName().impl());
+ tagList.insert(embedTag.localName().impl());
+ tagList.insert(fontTag.localName().impl());
+ tagList.insert(basefontTag.localName().impl());
+ tagList.insert(brTag.localName().impl());
+ tagList.insert(scriptTag.localName().impl());
+ tagList.insert(mapTag.localName().impl());
+ tagList.insert(qTag.localName().impl());
+ tagList.insert(subTag.localName().impl());
+ tagList.insert(supTag.localName().impl());
+ tagList.insert(spanTag.localName().impl());
+ tagList.insert(bdoTag.localName().impl());
+ tagList.insert(iframeTag.localName().impl());
+ tagList.insert(inputTag.localName().impl());
+ tagList.insert(keygenTag.localName().impl());
+ tagList.insert(selectTag.localName().impl());
+ tagList.insert(textareaTag.localName().impl());
+ tagList.insert(labelTag.localName().impl());
+ tagList.insert(buttonTag.localName().impl());
+ tagList.insert(insTag.localName().impl());
+ tagList.insert(delTag.localName().impl());
+ tagList.insert(nobrTag.localName().impl());
+ tagList.insert(wbrTag.localName().impl());
}
return &tagList;
}
@@ -763,39 +763,39 @@
HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> >* blockTagList() {
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > tagList;
if (tagList.isEmpty()) {
- tagList.insert(pTag.localName().implementation());
- tagList.insert(h1Tag.localName().implementation());
- tagList.insert(h2Tag.localName().implementation());
- tagList.insert(h3Tag.localName().implementation());
- tagList.insert(h4Tag.localName().implementation());
- tagList.insert(h5Tag.localName().implementation());
- tagList.insert(h6Tag.localName().implementation());
- tagList.insert(ulTag.localName().implementation());
- tagList.insert(olTag.localName().implementation());
- tagList.insert(dirTag.localName().implementation());
- tagList.insert(menuTag.localName().implementation());
- tagList.insert(preTag.localName().implementation());
- tagList.insert(plaintextTag.localName().implementation());
- tagList.insert(xmpTag.localName().implementation());
- tagList.insert(dlTag.localName().implementation());
- tagList.insert(divTag.localName().implementation());
- tagList.insert(layerTag.localName().implementation());
- tagList.insert(centerTag.localName().implementation());
- tagList.insert(noscriptTag.localName().implementation());
- tagList.insert(noframesTag.localName().implementation());
- tagList.insert(noembedTag.localName().implementation());
- tagList.insert(nolayerTag.localName().implementation());
- tagList.insert(blockquoteTag.localName().implementation());
- tagList.insert(formTag.localName().implementation());
- tagList.insert(isindexTag.localName().implementation());
- tagList.insert(hrTag.localName().implementation());
- tagList.insert(tableTag.localName().implementation());
- tagList.insert(fieldsetTag.localName().implementation());
- tagList.insert(addressTag.localName().implementation());
- tagList.insert(liTag.localName().implementation());
- tagList.insert(ddTag.localName().implementation());
- tagList.insert(dtTag.localName().implementation());
- tagList.insert(marqueeTag.localName().implementation());
+ tagList.insert(pTag.localName().impl());
+ tagList.insert(h1Tag.localName().impl());
+ tagList.insert(h2Tag.localName().impl());
+ tagList.insert(h3Tag.localName().impl());
+ tagList.insert(h4Tag.localName().impl());
+ tagList.insert(h5Tag.localName().impl());
+ tagList.insert(h6Tag.localName().impl());
+ tagList.insert(ulTag.localName().impl());
+ tagList.insert(olTag.localName().impl());
+ tagList.insert(dirTag.localName().impl());
+ tagList.insert(menuTag.localName().impl());
+ tagList.insert(preTag.localName().impl());
+ tagList.insert(plaintextTag.localName().impl());
+ tagList.insert(xmpTag.localName().impl());
+ tagList.insert(dlTag.localName().impl());
+ tagList.insert(divTag.localName().impl());
+ tagList.insert(layerTag.localName().impl());
+ tagList.insert(centerTag.localName().impl());
+ tagList.insert(noscriptTag.localName().impl());
+ tagList.insert(noframesTag.localName().impl());
+ tagList.insert(noembedTag.localName().impl());
+ tagList.insert(nolayerTag.localName().impl());
+ tagList.insert(blockquoteTag.localName().impl());
+ tagList.insert(formTag.localName().impl());
+ tagList.insert(isindexTag.localName().impl());
+ tagList.insert(hrTag.localName().impl());
+ tagList.insert(tableTag.localName().impl());
+ tagList.insert(fieldsetTag.localName().impl());
+ tagList.insert(addressTag.localName().impl());
+ tagList.insert(liTag.localName().impl());
+ tagList.insert(ddTag.localName().impl());
+ tagList.insert(dtTag.localName().impl());
+ tagList.insert(marqueeTag.localName().impl());
}
return &tagList;
}
@@ -807,9 +807,9 @@
if (newChild->isHTMLElement()) {
const HTMLElementImpl* child = static_cast<const HTMLElementImpl*>(newChild);
- if (inlineTagList()->contains(child->tagName().localName().implementation()))
+ if (inlineTagList()->contains(child->tagName().localName().impl()))
return true;
- if (blockTagList()->contains(child->tagName().localName().implementation()))
+ if (blockTagList()->contains(child->tagName().localName().impl()))
return true;
return !isRecognizedTagName(child->tagName()); // Accept custom html tags
}
@@ -824,7 +824,7 @@
if (newChild->isHTMLElement()) {
const HTMLElementImpl* child = static_cast<const HTMLElementImpl*>(newChild);
- if (inlineTagList()->contains(child->tagName().localName().implementation()))
+ if (inlineTagList()->contains(child->tagName().localName().impl()))
return true;
return !isRecognizedTagName(child->tagName()); // Accept custom html tags
}
@@ -839,7 +839,7 @@
if (newChild->isHTMLElement()) {
const HTMLElementImpl* child = static_cast<const HTMLElementImpl*>(newChild);
- return (blockTagList()->contains(child->tagName().localName().implementation()));
+ return (blockTagList()->contains(child->tagName().localName().impl()));
}
return false;
1.188 +8 -8 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- html_formimpl.cpp 25 Aug 2005 23:13:48 -0000 1.187
+++ html_formimpl.cpp 29 Aug 2005 21:29:17 -0000 1.188
@@ -686,14 +686,14 @@
if (!m_selectedRadioButtons)
m_selectedRadioButtons = new HashMap<DOMStringImpl*, HTMLInputElementImpl*, PointerHash<DOMStringImpl*> >;
- HTMLInputElementImpl* currentCheckedRadio = m_selectedRadioButtons->get(caller->name().implementation());
+ HTMLInputElementImpl* currentCheckedRadio = m_selectedRadioButtons->get(caller->name().impl());
if (currentCheckedRadio && currentCheckedRadio != caller)
currentCheckedRadio->setChecked(false);
// Now insert ourselves into the hash. There should really be a replace method
// in HashMap...
- m_selectedRadioButtons->remove(caller->name().implementation());
- m_selectedRadioButtons->insert(caller->name().implementation(), caller);
+ m_selectedRadioButtons->remove(caller->name().impl());
+ m_selectedRadioButtons->insert(caller->name().impl(), caller);
}
HTMLInputElementImpl* HTMLFormElementImpl::checkedRadioButtonForGroup(DOMStringImpl* name)
@@ -769,9 +769,9 @@
void HTMLFormElementImpl::removeFormElement(HTMLGenericFormElementImpl *e)
{
if (m_selectedRadioButtons && !e->name().isEmpty()) {
- HTMLGenericFormElementImpl* currentCheckedRadio = m_selectedRadioButtons->get(e->name().implementation());
+ HTMLGenericFormElementImpl* currentCheckedRadio = m_selectedRadioButtons->get(e->name().impl());
if (currentCheckedRadio == e)
- m_selectedRadioButtons->remove(e->name().implementation());
+ m_selectedRadioButtons->remove(e->name().impl());
}
removeFromVector(formElements, e);
@@ -1413,7 +1413,7 @@
}
// Allow keyboard focus if we're checked or if nothing in the group is checked.
- return checked() || !m_form->checkedRadioButtonForGroup(name().implementation());
+ return checked() || !m_form->checkedRadioButtonForGroup(name().impl());
}
return true;
@@ -1472,8 +1472,8 @@
setAttribute(typeAttr, type());
} else {
if (m_form && m_type == RADIO && !name().isEmpty()) {
- if (m_form->checkedRadioButtonForGroup(name().implementation()) == this)
- m_form->removeRadioButtonGroup(name().implementation());
+ if (m_form->checkedRadioButtonForGroup(name().impl()) == this)
+ m_form->removeRadioButtonGroup(name().impl());
}
bool wasAttached = m_attached;
if (wasAttached)
1.56 +2 -2 WebCore/khtml/html/html_headimpl.cpp
Index: html_headimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_headimpl.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- html_headimpl.cpp 25 Aug 2005 17:47:08 -0000 1.55
+++ html_headimpl.cpp 29 Aug 2005 21:29:18 -0000 1.56
@@ -592,7 +592,7 @@
removeChildren();
}
- appendChild(getDocument()->createTextNode(value.implementation()), exceptioncode);
+ appendChild(getDocument()->createTextNode(value.impl()), exceptioncode);
}
DOMString HTMLScriptElementImpl::htmlFor() const
@@ -832,6 +832,6 @@
removeChildren();
}
- appendChild(getDocument()->createTextNode(value.implementation()), exceptioncode);
+ appendChild(getDocument()->createTextNode(value.impl()), exceptioncode);
}
}
1.5 +68 -68 WebCore/khtml/html/htmlfactory.cpp
Index: htmlfactory.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlfactory.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- htmlfactory.cpp 25 Aug 2005 23:13:50 -0000 1.4
+++ htmlfactory.cpp 29 Aug 2005 21:29:18 -0000 1.5
@@ -342,76 +342,76 @@
gFunctionMap = new FunctionMap;
// Populate it with constructor functions.
- gFunctionMap->insert(htmlTag.localName().implementation(), (void*)&htmlConstructor);
- gFunctionMap->insert(headTag.localName().implementation(), (void*)&headConstructor);
- gFunctionMap->insert(bodyTag.localName().implementation(), (void*)&bodyConstructor);
- gFunctionMap->insert(baseTag.localName().implementation(), (void*)&baseConstructor);
- gFunctionMap->insert(linkTag.localName().implementation(), (void*)&linkConstructor);
- gFunctionMap->insert(metaTag.localName().implementation(), (void*)&metaConstructor);
- gFunctionMap->insert(styleTag.localName().implementation(), (void*)&styleConstructor);
- gFunctionMap->insert(titleTag.localName().implementation(), (void*)&titleConstructor);
- gFunctionMap->insert(frameTag.localName().implementation(), (void*)&frameConstructor);
- gFunctionMap->insert(framesetTag.localName().implementation(), (void*)&framesetConstructor);
- gFunctionMap->insert(iframeTag.localName().implementation(), (void*)&iframeConstructor);
- gFunctionMap->insert(formTag.localName().implementation(), (void*)&formConstructor);
- gFunctionMap->insert(buttonTag.localName().implementation(), (void*)&buttonConstructor);
- gFunctionMap->insert(inputTag.localName().implementation(), (void*)&inputConstructor);
- gFunctionMap->insert(isindexTag.localName().implementation(), (void*)&isindexConstructor);
- gFunctionMap->insert(fieldsetTag.localName().implementation(), (void*)&fieldsetConstructor);
- gFunctionMap->insert(labelTag.localName().implementation(), (void*)&labelConstructor);
- gFunctionMap->insert(legendTag.localName().implementation(), (void*)&legendConstructor);
- gFunctionMap->insert(optgroupTag.localName().implementation(), (void*)&optgroupConstructor);
- gFunctionMap->insert(optionTag.localName().implementation(), (void*)&optionConstructor);
- gFunctionMap->insert(selectTag.localName().implementation(), (void*)&selectConstructor);
- gFunctionMap->insert(textareaTag.localName().implementation(), (void*)&textareaConstructor);
- gFunctionMap->insert(dlTag.localName().implementation(), (void*)&dlConstructor);
- gFunctionMap->insert(olTag.localName().implementation(), (void*)&olConstructor);
- gFunctionMap->insert(ulTag.localName().implementation(), (void*)&ulConstructor);
- gFunctionMap->insert(dirTag.localName().implementation(), (void*)&dirConstructor);
- gFunctionMap->insert(menuTag.localName().implementation(), (void*)&menuConstructor);
- gFunctionMap->insert(liTag.localName().implementation(), (void*)&liConstructor);
- gFunctionMap->insert(blockquoteTag.localName().implementation(), (void*)&blockquoteConstructor);
- gFunctionMap->insert(divTag.localName().implementation(), (void*)&divConstructor);
- gFunctionMap->insert(h1Tag.localName().implementation(), (void*)&headingConstructor);
- gFunctionMap->insert(h2Tag.localName().implementation(), (void*)&headingConstructor);
- gFunctionMap->insert(h3Tag.localName().implementation(), (void*)&headingConstructor);
- gFunctionMap->insert(h4Tag.localName().implementation(), (void*)&headingConstructor);
- gFunctionMap->insert(h5Tag.localName().implementation(), (void*)&headingConstructor);
- gFunctionMap->insert(h6Tag.localName().implementation(), (void*)&headingConstructor);
- gFunctionMap->insert(hrTag.localName().implementation(), (void*)&hrConstructor);
- gFunctionMap->insert(pTag.localName().implementation(), (void*)¶graphConstructor);
- gFunctionMap->insert(preTag.localName().implementation(), (void*)&preConstructor);
- gFunctionMap->insert(xmpTag.localName().implementation(), (void*)&preConstructor);
- gFunctionMap->insert(basefontTag.localName().implementation(), (void*)&basefontConstructor);
- gFunctionMap->insert(fontTag.localName().implementation(), (void*)&fontConstructor);
- gFunctionMap->insert(delTag.localName().implementation(), (void*)&modConstructor);
- gFunctionMap->insert(insTag.localName().implementation(), (void*)&modConstructor);
- gFunctionMap->insert(aTag.localName().implementation(), (void*)&anchorConstructor);
- gFunctionMap->insert(imgTag.localName().implementation(), (void*)&imageConstructor);
- gFunctionMap->insert(mapTag.localName().implementation(), (void*)&mapConstructor);
- gFunctionMap->insert(areaTag.localName().implementation(), (void*)&areaConstructor);
- gFunctionMap->insert(canvasTag.localName().implementation(), (void*)&canvasConstructor);
- gFunctionMap->insert(appletTag.localName().implementation(), (void*)&appletConstructor);
- gFunctionMap->insert(embedTag.localName().implementation(), (void*)&embedConstructor);
- gFunctionMap->insert(objectTag.localName().implementation(), (void*)&objectConstructor);
- gFunctionMap->insert(paramTag.localName().implementation(), (void*)¶mConstructor);
- gFunctionMap->insert(scriptTag.localName().implementation(), (void*)&scriptConstructor);
- gFunctionMap->insert(tableTag.localName().implementation(), (void*)&tableConstructor);
- gFunctionMap->insert(captionTag.localName().implementation(), (void*)&tableCaptionConstructor);
- gFunctionMap->insert(colgroupTag.localName().implementation(), (void*)&tableColConstructor);
- gFunctionMap->insert(colTag.localName().implementation(), (void*)&tableColConstructor);
- gFunctionMap->insert(trTag.localName().implementation(), (void*)&tableRowConstructor);
- gFunctionMap->insert(tdTag.localName().implementation(), (void*)&tableCellConstructor);
- gFunctionMap->insert(thTag.localName().implementation(), (void*)&tableCellConstructor);
- gFunctionMap->insert(theadTag.localName().implementation(), (void*)&tableSectionConstructor);
- gFunctionMap->insert(tbodyTag.localName().implementation(), (void*)&tableSectionConstructor);
- gFunctionMap->insert(tfootTag.localName().implementation(), (void*)&tableSectionConstructor);
- gFunctionMap->insert(brTag.localName().implementation(), (void*)&brConstructor);
- gFunctionMap->insert(qTag.localName().implementation(), (void*)"eConstructor);
- gFunctionMap->insert(marqueeTag.localName().implementation(), (void*)&marqueeConstructor);
+ gFunctionMap->insert(htmlTag.localName().impl(), (void*)&htmlConstructor);
+ gFunctionMap->insert(headTag.localName().impl(), (void*)&headConstructor);
+ gFunctionMap->insert(bodyTag.localName().impl(), (void*)&bodyConstructor);
+ gFunctionMap->insert(baseTag.localName().impl(), (void*)&baseConstructor);
+ gFunctionMap->insert(linkTag.localName().impl(), (void*)&linkConstructor);
+ gFunctionMap->insert(metaTag.localName().impl(), (void*)&metaConstructor);
+ gFunctionMap->insert(styleTag.localName().impl(), (void*)&styleConstructor);
+ gFunctionMap->insert(titleTag.localName().impl(), (void*)&titleConstructor);
+ gFunctionMap->insert(frameTag.localName().impl(), (void*)&frameConstructor);
+ gFunctionMap->insert(framesetTag.localName().impl(), (void*)&framesetConstructor);
+ gFunctionMap->insert(iframeTag.localName().impl(), (void*)&iframeConstructor);
+ gFunctionMap->insert(formTag.localName().impl(), (void*)&formConstructor);
+ gFunctionMap->insert(buttonTag.localName().impl(), (void*)&buttonConstructor);
+ gFunctionMap->insert(inputTag.localName().impl(), (void*)&inputConstructor);
+ gFunctionMap->insert(isindexTag.localName().impl(), (void*)&isindexConstructor);
+ gFunctionMap->insert(fieldsetTag.localName().impl(), (void*)&fieldsetConstructor);
+ gFunctionMap->insert(labelTag.localName().impl(), (void*)&labelConstructor);
+ gFunctionMap->insert(legendTag.localName().impl(), (void*)&legendConstructor);
+ gFunctionMap->insert(optgroupTag.localName().impl(), (void*)&optgroupConstructor);
+ gFunctionMap->insert(optionTag.localName().impl(), (void*)&optionConstructor);
+ gFunctionMap->insert(selectTag.localName().impl(), (void*)&selectConstructor);
+ gFunctionMap->insert(textareaTag.localName().impl(), (void*)&textareaConstructor);
+ gFunctionMap->insert(dlTag.localName().impl(), (void*)&dlConstructor);
+ gFunctionMap->insert(olTag.localName().impl(), (void*)&olConstructor);
+ gFunctionMap->insert(ulTag.localName().impl(), (void*)&ulConstructor);
+ gFunctionMap->insert(dirTag.localName().impl(), (void*)&dirConstructor);
+ gFunctionMap->insert(menuTag.localName().impl(), (void*)&menuConstructor);
+ gFunctionMap->insert(liTag.localName().impl(), (void*)&liConstructor);
+ gFunctionMap->insert(blockquoteTag.localName().impl(), (void*)&blockquoteConstructor);
+ gFunctionMap->insert(divTag.localName().impl(), (void*)&divConstructor);
+ gFunctionMap->insert(h1Tag.localName().impl(), (void*)&headingConstructor);
+ gFunctionMap->insert(h2Tag.localName().impl(), (void*)&headingConstructor);
+ gFunctionMap->insert(h3Tag.localName().impl(), (void*)&headingConstructor);
+ gFunctionMap->insert(h4Tag.localName().impl(), (void*)&headingConstructor);
+ gFunctionMap->insert(h5Tag.localName().impl(), (void*)&headingConstructor);
+ gFunctionMap->insert(h6Tag.localName().impl(), (void*)&headingConstructor);
+ gFunctionMap->insert(hrTag.localName().impl(), (void*)&hrConstructor);
+ gFunctionMap->insert(pTag.localName().impl(), (void*)¶graphConstructor);
+ gFunctionMap->insert(preTag.localName().impl(), (void*)&preConstructor);
+ gFunctionMap->insert(xmpTag.localName().impl(), (void*)&preConstructor);
+ gFunctionMap->insert(basefontTag.localName().impl(), (void*)&basefontConstructor);
+ gFunctionMap->insert(fontTag.localName().impl(), (void*)&fontConstructor);
+ gFunctionMap->insert(delTag.localName().impl(), (void*)&modConstructor);
+ gFunctionMap->insert(insTag.localName().impl(), (void*)&modConstructor);
+ gFunctionMap->insert(aTag.localName().impl(), (void*)&anchorConstructor);
+ gFunctionMap->insert(imgTag.localName().impl(), (void*)&imageConstructor);
+ gFunctionMap->insert(mapTag.localName().impl(), (void*)&mapConstructor);
+ gFunctionMap->insert(areaTag.localName().impl(), (void*)&areaConstructor);
+ gFunctionMap->insert(canvasTag.localName().impl(), (void*)&canvasConstructor);
+ gFunctionMap->insert(appletTag.localName().impl(), (void*)&appletConstructor);
+ gFunctionMap->insert(embedTag.localName().impl(), (void*)&embedConstructor);
+ gFunctionMap->insert(objectTag.localName().impl(), (void*)&objectConstructor);
+ gFunctionMap->insert(paramTag.localName().impl(), (void*)¶mConstructor);
+ gFunctionMap->insert(scriptTag.localName().impl(), (void*)&scriptConstructor);
+ gFunctionMap->insert(tableTag.localName().impl(), (void*)&tableConstructor);
+ gFunctionMap->insert(captionTag.localName().impl(), (void*)&tableCaptionConstructor);
+ gFunctionMap->insert(colgroupTag.localName().impl(), (void*)&tableColConstructor);
+ gFunctionMap->insert(colTag.localName().impl(), (void*)&tableColConstructor);
+ gFunctionMap->insert(trTag.localName().impl(), (void*)&tableRowConstructor);
+ gFunctionMap->insert(tdTag.localName().impl(), (void*)&tableCellConstructor);
+ gFunctionMap->insert(thTag.localName().impl(), (void*)&tableCellConstructor);
+ gFunctionMap->insert(theadTag.localName().impl(), (void*)&tableSectionConstructor);
+ gFunctionMap->insert(tbodyTag.localName().impl(), (void*)&tableSectionConstructor);
+ gFunctionMap->insert(tfootTag.localName().impl(), (void*)&tableSectionConstructor);
+ gFunctionMap->insert(brTag.localName().impl(), (void*)&brConstructor);
+ gFunctionMap->insert(qTag.localName().impl(), (void*)"eConstructor);
+ gFunctionMap->insert(marqueeTag.localName().impl(), (void*)&marqueeConstructor);
}
- void* result = gFunctionMap->get(tagName.implementation());
+ void* result = gFunctionMap->get(tagName.impl());
if (result) {
ConstructorFunc func = (ConstructorFunc)result;
return (func)(tagName, docPtr, form, createdByParser);
1.108 +79 -79 WebCore/khtml/html/htmlparser.cpp
Index: htmlparser.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmlparser.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- htmlparser.cpp 29 Aug 2005 18:00:44 -0000 1.107
+++ htmlparser.cpp 29 Aug 2005 21:29:18 -0000 1.108
@@ -764,43 +764,43 @@
// Init our error handling table.
static FunctionMap gFunctionMap;
if (gFunctionMap.isEmpty()) {
- gFunctionMap.insert(textAtom.implementation(), &HTMLParser::textCreateErrorCheck);
- gFunctionMap.insert(commentAtom.implementation(), &HTMLParser::commentCreateErrorCheck);
- gFunctionMap.insert(headTag.localName().implementation(), &HTMLParser::headCreateErrorCheck);
- gFunctionMap.insert(bodyTag.localName().implementation(), &HTMLParser::bodyCreateErrorCheck);
- gFunctionMap.insert(framesetTag.localName().implementation(), &HTMLParser::framesetCreateErrorCheck);
- gFunctionMap.insert(iframeTag.localName().implementation(), &HTMLParser::iframeCreateErrorCheck);
- gFunctionMap.insert(formTag.localName().implementation(), &HTMLParser::formCreateErrorCheck);
- gFunctionMap.insert(isindexTag.localName().implementation(), &HTMLParser::isindexCreateErrorCheck);
- gFunctionMap.insert(selectTag.localName().implementation(), &HTMLParser::selectCreateErrorCheck);
- gFunctionMap.insert(ddTag.localName().implementation(), &HTMLParser::ddCreateErrorCheck);
- gFunctionMap.insert(dtTag.localName().implementation(), &HTMLParser::dtCreateErrorCheck);
- gFunctionMap.insert(liTag.localName().implementation(), &HTMLParser::nestedCreateErrorCheck);
- gFunctionMap.insert(aTag.localName().implementation(), &HTMLParser::nestedCreateErrorCheck);
- gFunctionMap.insert(nobrTag.localName().implementation(), &HTMLParser::nestedCreateErrorCheck);
- gFunctionMap.insert(wbrTag.localName().implementation(), &HTMLParser::nestedCreateErrorCheck);
- gFunctionMap.insert(trTag.localName().implementation(), &HTMLParser::nestedCreateErrorCheck);
- gFunctionMap.insert(tdTag.localName().implementation(), &HTMLParser::tableCellCreateErrorCheck);
- gFunctionMap.insert(thTag.localName().implementation(), &HTMLParser::tableCellCreateErrorCheck);
- gFunctionMap.insert(tbodyTag.localName().implementation(), &HTMLParser::tableSectionCreateErrorCheck);
- gFunctionMap.insert(theadTag.localName().implementation(), &HTMLParser::tableSectionCreateErrorCheck);
- gFunctionMap.insert(tfootTag.localName().implementation(), &HTMLParser::tableSectionCreateErrorCheck);
- gFunctionMap.insert(ttTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(uTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(bTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(iTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(sTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(strikeTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(bigTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(smallTag.localName().implementation(), &HTMLParser::nestedStyleCreateErrorCheck);
- gFunctionMap.insert(noembedTag.localName().implementation(), &HTMLParser::noembedCreateErrorCheck);
- gFunctionMap.insert(noframesTag.localName().implementation(), &HTMLParser::noframesCreateErrorCheck);
- gFunctionMap.insert(noscriptTag.localName().implementation(), &HTMLParser::noscriptCreateErrorCheck);
+ gFunctionMap.insert(textAtom.impl(), &HTMLParser::textCreateErrorCheck);
+ gFunctionMap.insert(commentAtom.impl(), &HTMLParser::commentCreateErrorCheck);
+ gFunctionMap.insert(headTag.localName().impl(), &HTMLParser::headCreateErrorCheck);
+ gFunctionMap.insert(bodyTag.localName().impl(), &HTMLParser::bodyCreateErrorCheck);
+ gFunctionMap.insert(framesetTag.localName().impl(), &HTMLParser::framesetCreateErrorCheck);
+ gFunctionMap.insert(iframeTag.localName().impl(), &HTMLParser::iframeCreateErrorCheck);
+ gFunctionMap.insert(formTag.localName().impl(), &HTMLParser::formCreateErrorCheck);
+ gFunctionMap.insert(isindexTag.localName().impl(), &HTMLParser::isindexCreateErrorCheck);
+ gFunctionMap.insert(selectTag.localName().impl(), &HTMLParser::selectCreateErrorCheck);
+ gFunctionMap.insert(ddTag.localName().impl(), &HTMLParser::ddCreateErrorCheck);
+ gFunctionMap.insert(dtTag.localName().impl(), &HTMLParser::dtCreateErrorCheck);
+ gFunctionMap.insert(liTag.localName().impl(), &HTMLParser::nestedCreateErrorCheck);
+ gFunctionMap.insert(aTag.localName().impl(), &HTMLParser::nestedCreateErrorCheck);
+ gFunctionMap.insert(nobrTag.localName().impl(), &HTMLParser::nestedCreateErrorCheck);
+ gFunctionMap.insert(wbrTag.localName().impl(), &HTMLParser::nestedCreateErrorCheck);
+ gFunctionMap.insert(trTag.localName().impl(), &HTMLParser::nestedCreateErrorCheck);
+ gFunctionMap.insert(tdTag.localName().impl(), &HTMLParser::tableCellCreateErrorCheck);
+ gFunctionMap.insert(thTag.localName().impl(), &HTMLParser::tableCellCreateErrorCheck);
+ gFunctionMap.insert(tbodyTag.localName().impl(), &HTMLParser::tableSectionCreateErrorCheck);
+ gFunctionMap.insert(theadTag.localName().impl(), &HTMLParser::tableSectionCreateErrorCheck);
+ gFunctionMap.insert(tfootTag.localName().impl(), &HTMLParser::tableSectionCreateErrorCheck);
+ gFunctionMap.insert(ttTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(uTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(bTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(iTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(sTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(strikeTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(bigTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(smallTag.localName().impl(), &HTMLParser::nestedStyleCreateErrorCheck);
+ gFunctionMap.insert(noembedTag.localName().impl(), &HTMLParser::noembedCreateErrorCheck);
+ gFunctionMap.insert(noframesTag.localName().impl(), &HTMLParser::noframesCreateErrorCheck);
+ gFunctionMap.insert(noscriptTag.localName().impl(), &HTMLParser::noscriptCreateErrorCheck);
}
bool proceed = true;
NodeImpl* result = 0;
- CreateErrorCheckFunc errorCheckFunc = gFunctionMap.get(t->tagName.implementation());
+ CreateErrorCheckFunc errorCheckFunc = gFunctionMap.get(t->tagName.impl());
if (errorCheckFunc)
proceed = (this->*(errorCheckFunc))(t, result);
@@ -860,15 +860,15 @@
{
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > headerTags;
if (headerTags.isEmpty()) {
- headerTags.insert(h1Tag.localName().implementation());
- headerTags.insert(h2Tag.localName().implementation());
- headerTags.insert(h3Tag.localName().implementation());
- headerTags.insert(h4Tag.localName().implementation());
- headerTags.insert(h5Tag.localName().implementation());
- headerTags.insert(h6Tag.localName().implementation());
+ headerTags.insert(h1Tag.localName().impl());
+ headerTags.insert(h2Tag.localName().impl());
+ headerTags.insert(h3Tag.localName().impl());
+ headerTags.insert(h4Tag.localName().impl());
+ headerTags.insert(h5Tag.localName().impl());
+ headerTags.insert(h6Tag.localName().impl());
}
- return headerTags.contains(tagName.implementation());
+ return headerTags.contains(tagName.impl());
}
void HTMLParser::popNestedHeaderTag()
@@ -912,28 +912,28 @@
{
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > residualStyleTags;
if (residualStyleTags.isEmpty()) {
- residualStyleTags.insert(aTag.localName().implementation());
- residualStyleTags.insert(fontTag.localName().implementation());
- residualStyleTags.insert(ttTag.localName().implementation());
- residualStyleTags.insert(uTag.localName().implementation());
- residualStyleTags.insert(bTag.localName().implementation());
- residualStyleTags.insert(iTag.localName().implementation());
- residualStyleTags.insert(sTag.localName().implementation());
- residualStyleTags.insert(strikeTag.localName().implementation());
- residualStyleTags.insert(bigTag.localName().implementation());
- residualStyleTags.insert(smallTag.localName().implementation());
- residualStyleTags.insert(emTag.localName().implementation());
- residualStyleTags.insert(strongTag.localName().implementation());
- residualStyleTags.insert(dfnTag.localName().implementation());
- residualStyleTags.insert(codeTag.localName().implementation());
- residualStyleTags.insert(sampTag.localName().implementation());
- residualStyleTags.insert(kbdTag.localName().implementation());
- residualStyleTags.insert(varTag.localName().implementation());
- residualStyleTags.insert(nobrTag.localName().implementation());
- residualStyleTags.insert(wbrTag.localName().implementation());
+ residualStyleTags.insert(aTag.localName().impl());
+ residualStyleTags.insert(fontTag.localName().impl());
+ residualStyleTags.insert(ttTag.localName().impl());
+ residualStyleTags.insert(uTag.localName().impl());
+ residualStyleTags.insert(bTag.localName().impl());
+ residualStyleTags.insert(iTag.localName().impl());
+ residualStyleTags.insert(sTag.localName().impl());
+ residualStyleTags.insert(strikeTag.localName().impl());
+ residualStyleTags.insert(bigTag.localName().impl());
+ residualStyleTags.insert(smallTag.localName().impl());
+ residualStyleTags.insert(emTag.localName().impl());
+ residualStyleTags.insert(strongTag.localName().impl());
+ residualStyleTags.insert(dfnTag.localName().impl());
+ residualStyleTags.insert(codeTag.localName().impl());
+ residualStyleTags.insert(sampTag.localName().impl());
+ residualStyleTags.insert(kbdTag.localName().impl());
+ residualStyleTags.insert(varTag.localName().impl());
+ residualStyleTags.insert(nobrTag.localName().impl());
+ residualStyleTags.insert(wbrTag.localName().impl());
}
- return residualStyleTags.contains(tagName.implementation());
+ return residualStyleTags.contains(tagName.impl());
}
bool HTMLParser::isAffectedByResidualStyle(const AtomicString& tagName)
@@ -943,27 +943,27 @@
static HashSet<DOMStringImpl*, PointerHash<DOMStringImpl*> > affectedBlockTags;
if (affectedBlockTags.isEmpty()) {
- affectedBlockTags.insert(h1Tag.localName().implementation());
- affectedBlockTags.insert(h2Tag.localName().implementation());
- affectedBlockTags.insert(h3Tag.localName().implementation());
- affectedBlockTags.insert(h4Tag.localName().implementation());
- affectedBlockTags.insert(h5Tag.localName().implementation());
- affectedBlockTags.insert(h6Tag.localName().implementation());
- affectedBlockTags.insert(pTag.localName().implementation());
- affectedBlockTags.insert(divTag.localName().implementation());
- affectedBlockTags.insert(blockquoteTag.localName().implementation());
- affectedBlockTags.insert(addressTag.localName().implementation());
- affectedBlockTags.insert(centerTag.localName().implementation());
- affectedBlockTags.insert(ulTag.localName().implementation());
- affectedBlockTags.insert(olTag.localName().implementation());
- affectedBlockTags.insert(liTag.localName().implementation());
- affectedBlockTags.insert(dlTag.localName().implementation());
- affectedBlockTags.insert(dtTag.localName().implementation());
- affectedBlockTags.insert(ddTag.localName().implementation());
- affectedBlockTags.insert(preTag.localName().implementation());
+ affectedBlockTags.insert(h1Tag.localName().impl());
+ affectedBlockTags.insert(h2Tag.localName().impl());
+ affectedBlockTags.insert(h3Tag.localName().impl());
+ affectedBlockTags.insert(h4Tag.localName().impl());
+ affectedBlockTags.insert(h5Tag.localName().impl());
+ affectedBlockTags.insert(h6Tag.localName().impl());
+ affectedBlockTags.insert(pTag.localName().impl());
+ affectedBlockTags.insert(divTag.localName().impl());
+ affectedBlockTags.insert(blockquoteTag.localName().impl());
+ affectedBlockTags.insert(addressTag.localName().impl());
+ affectedBlockTags.insert(centerTag.localName().impl());
+ affectedBlockTags.insert(ulTag.localName().impl());
+ affectedBlockTags.insert(olTag.localName().impl());
+ affectedBlockTags.insert(liTag.localName().impl());
+ affectedBlockTags.insert(dlTag.localName().impl());
+ affectedBlockTags.insert(dtTag.localName().impl());
+ affectedBlockTags.insert(ddTag.localName().impl());
+ affectedBlockTags.insert(preTag.localName().impl());
}
- return affectedBlockTags.contains(tagName.implementation());
+ return affectedBlockTags.contains(tagName.impl());
}
void HTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
1.49 +1 -1 WebCore/khtml/rendering/render_line.cpp
Index: render_line.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_line.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- render_line.cpp 27 Aug 2005 00:14:21 -0000 1.48
+++ render_line.cpp 29 Aug 2005 21:29:21 -0000 1.49
@@ -1084,7 +1084,7 @@
font->drawText(p, m_x + _tx,
m_y + _ty + m_baseline,
0, 0,
- (str.implementation())->s,
+ (str.impl())->s,
str.length(), 0, str.length(),
0,
QPainter::LTR, _style->visuallyOrdered());
1.36 +11 -11 WebCore/khtml/xml/dom2_eventsimpl.cpp
Index: dom2_eventsimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom2_eventsimpl.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dom2_eventsimpl.cpp 8 Aug 2005 22:29:39 -0000 1.35
+++ dom2_eventsimpl.cpp 29 Aug 2005 21:29:22 -0000 1.36
@@ -57,7 +57,7 @@
EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg)
{
DOMString t = EventImpl::idToType(_id);
- m_type = t.implementation();
+ m_type = t.impl();
if (m_type)
m_type->ref();
m_canBubble = canBubbleArg;
@@ -156,7 +156,7 @@
if (m_type)
m_type->deref();
- m_type = eventTypeArg.implementation();
+ m_type = eventTypeArg.impl();
if (m_type)
m_type->ref();
@@ -583,7 +583,7 @@
#if APPLE_CHANGES
DOMString identifier(key->keyIdentifier());
- m_keyIdentifier = identifier.implementation();
+ m_keyIdentifier = identifier.impl();
m_keyIdentifier->ref();
#else
m_keyIdentifier = 0;
@@ -612,7 +612,7 @@
: UIEventWithKeyStateImpl(_id, canBubbleArg, cancelableArg, viewArg, 0, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg)
{
m_keyEvent = 0;
- m_keyIdentifier = keyIdentifierArg.implementation();
+ m_keyIdentifier = keyIdentifierArg.impl();
if (m_keyIdentifier)
m_keyIdentifier->ref();
m_keyLocation = keyLocationArg;
@@ -642,7 +642,7 @@
m_keyIdentifier->deref();
UIEventImpl::initUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, 0);
- m_keyIdentifier = keyIdentifierArg.implementation();
+ m_keyIdentifier = keyIdentifierArg.impl();
if (m_keyIdentifier)
m_keyIdentifier->ref();
m_keyLocation = keyLocationArg;
@@ -719,13 +719,13 @@
m_relatedNode = relatedNodeArg;
if (m_relatedNode)
m_relatedNode->ref();
- m_prevValue = prevValueArg.implementation();
+ m_prevValue = prevValueArg.impl();
if (m_prevValue)
m_prevValue->ref();
- m_newValue = newValueArg.implementation();
+ m_newValue = newValueArg.impl();
if (m_newValue)
m_newValue->ref();
- m_attrName = attrNameArg.implementation();
+ m_attrName = attrNameArg.impl();
if (m_attrName)
m_attrName->ref();
m_attrChange = attrChangeArg;
@@ -766,13 +766,13 @@
m_relatedNode = relatedNodeArg;
if (m_relatedNode)
m_relatedNode->ref();
- m_prevValue = prevValueArg.implementation();
+ m_prevValue = prevValueArg.impl();
if (m_prevValue)
m_prevValue->ref();
- m_newValue = newValueArg.implementation();
+ m_newValue = newValueArg.impl();
if (m_newValue)
m_newValue->ref();
- m_attrName = attrNameArg.implementation();
+ m_attrName = attrNameArg.impl();
if (m_attrName)
m_attrName->ref();
m_attrChange = attrChangeArg;
1.12 +1 -1 WebCore/khtml/xml/dom_atomicstring.cpp
Index: dom_atomicstring.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_atomicstring.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dom_atomicstring.cpp 10 Jul 2005 22:40:29 -0000 1.11
+++ dom_atomicstring.cpp 29 Aug 2005 21:29:22 -0000 1.12
@@ -55,7 +55,7 @@
bool AtomicString::equal(const AtomicString &a, const char *b)
{
- DOMStringImpl *impl = a.m_string.implementation();
+ DOMStringImpl *impl = a.m_string.impl();
if ((!impl || !impl->s) && !b)
return true;
if ((!impl || !impl->s) || !b)
1.8 +3 -3 WebCore/khtml/xml/dom_atomicstring.h
Index: dom_atomicstring.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_atomicstring.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dom_atomicstring.h 25 Aug 2005 17:47:20 -0000 1.7
+++ dom_atomicstring.h 29 Aug 2005 21:29:22 -0000 1.8
@@ -36,13 +36,13 @@
AtomicString(const unsigned short* s, int length) : m_string(add((QChar*)s, length)) { }
AtomicString(const QString& s) : m_string(add(s.unicode(), s.length())) { }
AtomicString(DOMStringImpl* imp) : m_string(add(imp)) { }
- explicit AtomicString(const DOMString &s) : m_string(add(s.implementation())) { }
+ explicit AtomicString(const DOMString &s) : m_string(add(s.impl())) { }
operator const DOMString&() const { return m_string; }
const DOMString& domString() const { return m_string; };
QString qstring() const { return m_string.qstring(); };
- DOMStringImpl* implementation() const { return m_string.implementation(); }
+ DOMStringImpl* impl() const { return m_string.impl(); }
const QChar *unicode() const { return m_string.unicode(); }
int length() const { return m_string.length(); }
@@ -78,7 +78,7 @@
static bool equal(DOMStringImpl *, DOMStringImpl *);
static bool equal(const AtomicString &a, const AtomicString &b)
- { return a.m_string.implementation() == b.m_string.implementation(); }
+ { return a.m_string.impl() == b.m_string.impl(); }
static bool equal(const AtomicString &a, const char *b);
static DOMStringImpl *add(const char *);
1.249 +8 -8 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- dom_docimpl.cpp 25 Aug 2005 17:47:20 -0000 1.248
+++ dom_docimpl.cpp 29 Aug 2005 21:29:22 -0000 1.249
@@ -193,7 +193,7 @@
// from "http://www.w3.org/XML/1998/namespace" [Namespaces].
int colonpos = -1;
uint i;
- DOMStringImpl *qname = qualifiedName.implementation();
+ DOMStringImpl *qname = qualifiedName.impl();
for (i = 0; i < qname->l && colonpos < 0; i++) {
if ((*qname)[i] == ':')
colonpos = i;
@@ -214,7 +214,7 @@
// WRONG_DOCUMENT_ERR: Raised if doctype has already been used with a different document or was
// created from a different implementation.
- if (doctype && (doctype->getDocument() || doctype->implementation() != this)) {
+ if (doctype && (doctype->getDocument() || doctype->impl() != this)) {
exceptioncode = DOMException::WRONG_DOCUMENT_ERR;
return 0;
}
@@ -486,7 +486,7 @@
return m_doctype;
}
-DOMImplementationImpl *DocumentImpl::implementation() const
+DOMImplementationImpl *DocumentImpl::impl() const
{
return m_implementation;
}
@@ -551,7 +551,7 @@
exception = DOMException::NOT_SUPPORTED_ERR;
return NULL;
}
- return new EntityReferenceImpl(docPtr(), name.implementation());
+ return new EntityReferenceImpl(docPtr(), name.impl());
}
EditingTextImpl *DocumentImpl::createEditingTextNode(const DOMString &text)
@@ -593,7 +593,7 @@
unsigned length = attrs->length();
for (unsigned i = 0; i < length; i++) {
AttributeImpl* attr = attrs->attributeItem(i);
- newElement->setAttribute(attr->name(), attr->value().implementation(), exceptioncode);
+ newElement->setAttribute(attr->name(), attr->value().impl(), exceptioncode);
if (exceptioncode != 0) {
newElement->deref();
return 0;
@@ -3063,9 +3063,9 @@
// FIXME: Assume this is a mapped attribute, since createAttribute isn't namespace-aware. There's no harm to XML
// documents if we're wrong.
- return new AttrImpl(0, docPtr(), new MappedAttributeImpl(QualifiedName(prefix.implementation(),
- localName.implementation(),
- namespaceURI.implementation()), DOMString("").implementation()), false);
+ return new AttrImpl(0, docPtr(), new MappedAttributeImpl(QualifiedName(prefix.impl(),
+ localName.impl(),
+ namespaceURI.impl()), DOMString("").impl()), false);
}
SharedPtr<HTMLCollectionImpl> DocumentImpl::images()
1.123 +2 -2 WebCore/khtml/xml/dom_docimpl.h
Index: dom_docimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- dom_docimpl.h 25 Aug 2005 17:12:12 -0000 1.122
+++ dom_docimpl.h 29 Aug 2005 21:29:23 -0000 1.123
@@ -175,7 +175,7 @@
virtual DocumentTypeImpl *doctype() const; // returns 0 for HTML documents
DocumentTypeImpl *realDocType() const { return m_doctype; }
- DOMImplementationImpl *implementation() const;
+ DOMImplementationImpl *impl() const;
virtual ElementImpl *documentElement() const;
virtual ElementImpl *createElement(const DOMString &tagName, int &exceptioncode);
DocumentFragmentImpl *createDocumentFragment ();
@@ -814,7 +814,7 @@
void setName(const DOMString& n) { m_qualifiedName = n; }
void setPublicId(const DOMString& publicId) { m_publicId = publicId; }
void setSystemId(const DOMString& systemId) { m_systemId = systemId; }
- DOMImplementationImpl *implementation() const { return m_implementation; }
+ DOMImplementationImpl *impl() const { return m_implementation; }
void copyFrom(const DocumentTypeImpl&);
virtual DOMString toString() const;
1.76 +24 -24 WebCore/khtml/xml/dom_elementimpl.cpp
Index: dom_elementimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_elementimpl.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- dom_elementimpl.cpp 25 Aug 2005 17:47:20 -0000 1.75
+++ dom_elementimpl.cpp 29 Aug 2005 21:29:23 -0000 1.76
@@ -74,7 +74,7 @@
if (createTextChild && !m_attribute->value().isEmpty()) {
int exceptioncode = 0;
m_ignoreChildrenChanged++;
- appendChild(getDocument()->createTextNode(m_attribute->value().implementation()), exceptioncode);
+ appendChild(getDocument()->createTextNode(m_attribute->value().impl()), exceptioncode);
m_ignoreChildrenChanged--;
}
}
@@ -136,10 +136,10 @@
int e = 0;
m_ignoreChildrenChanged++;
removeChildren();
- appendChild(getDocument()->createTextNode(v.implementation()), e);
+ appendChild(getDocument()->createTextNode(v.impl()), e);
m_ignoreChildrenChanged--;
- m_attribute->setValue(v.implementation());
+ m_attribute->setValue(v.impl());
if (m_element)
m_element->attributeChanged(m_attribute);
}
@@ -195,7 +195,7 @@
val += static_cast<TextImpl *>(n)->data();
}
- m_attribute->setValue(val.implementation());
+ m_attribute->setValue(val.impl());
if (m_element)
m_element->attributeChanged(m_attribute);
}
@@ -278,7 +278,7 @@
void ElementImpl::setAttribute(const QualifiedName& name, const DOMString &value)
{
int exceptioncode = 0;
- setAttribute(name, value.implementation(), exceptioncode);
+ setAttribute(name, value.impl(), exceptioncode);
}
// Virtual function, defined in base class.
@@ -344,7 +344,7 @@
DOMString ln(localName);
if (getDocument()->isHTMLDocument())
ln = localName.lower();
- QualifiedName name(nullAtom, ln.implementation(), namespaceURI.implementation());
+ QualifiedName name(nullAtom, ln.impl(), namespaceURI.impl());
return getAttribute(name);
}
@@ -752,8 +752,8 @@
if (getDocument()->isHTMLDocument())
localName = localName.lower();
- setAttribute(QualifiedName(prefix.implementation(), localName.implementation(),
- namespaceURI.implementation()), value.implementation(), exception);
+ setAttribute(QualifiedName(prefix.impl(), localName.impl(),
+ namespaceURI.impl()), value.impl(), exception);
}
void ElementImpl::removeAttributeNS(const DOMString &namespaceURI, const DOMString &localName, int &exception)
@@ -761,7 +761,7 @@
DOMString ln(localName);
if (getDocument() && getDocument()->isHTMLDocument())
ln = localName.lower();
- removeAttribute(QualifiedName(nullAtom, ln.implementation(), namespaceURI.implementation()), exception);
+ removeAttribute(QualifiedName(nullAtom, ln.impl(), namespaceURI.impl()), exception);
}
AttrImpl *ElementImpl::getAttributeNodeNS(const DOMString &namespaceURI, const DOMString &localName)
@@ -772,7 +772,7 @@
DOMString ln(localName);
if (getDocument() && getDocument()->isHTMLDocument())
ln = localName.lower();
- return attrs->getNamedItem(QualifiedName(nullAtom, localName.implementation(), namespaceURI.implementation()));
+ return attrs->getNamedItem(QualifiedName(nullAtom, localName.impl(), namespaceURI.impl()));
}
bool ElementImpl::hasAttributeNS(const DOMString &namespaceURI, const DOMString &localName) const
@@ -783,8 +783,8 @@
DOMString ln(localName);
if (getDocument() && getDocument()->isHTMLDocument())
ln = localName.lower();
- return attrs->getAttributeItem(QualifiedName(nullAtom, localName.implementation(),
- namespaceURI.implementation()));
+ return attrs->getAttributeItem(QualifiedName(nullAtom, localName.impl(),
+ namespaceURI.impl()));
}
CSSStyleDeclarationImpl *ElementImpl::style()
@@ -853,7 +853,7 @@
DOMString ln(localName);
if (element->getDocument()->isHTMLDocument())
ln = localName.lower();
- return getNamedItem(QualifiedName(nullAtom, ln.implementation(), namespaceURI.implementation()));
+ return getNamedItem(QualifiedName(nullAtom, ln.impl(), namespaceURI.impl()));
}
SharedPtr<NodeImpl> NamedAttrMapImpl::removeNamedItemNS(const DOMString &namespaceURI, const DOMString &localName, int &exception)
@@ -861,7 +861,7 @@
DOMString ln(localName);
if (element->getDocument()->isHTMLDocument())
ln = localName.lower();
- return removeNamedItem(QualifiedName(nullAtom, ln.implementation(), namespaceURI.implementation()), exception);
+ return removeNamedItem(QualifiedName(nullAtom, ln.impl(), namespaceURI.impl()), exception);
}
AttrImpl *NamedAttrMapImpl::getNamedItem(const QualifiedName& name) const
@@ -1126,9 +1126,9 @@
QPtrDict<QPtrDict<CSSMappedAttributeDeclarationImpl> >* attrNameDict = m_mappedAttributeDecls->find((void*)entryType);
if (attrNameDict) {
QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict =
- attrNameDict->find((void*)attr->name().localName().implementation());
+ attrNameDict->find((void*)attr->name().localName().impl());
if (attrValueDict)
- return attrValueDict->find(attr->value().implementation());
+ return attrValueDict->find(attr->value().impl());
}
return 0;
}
@@ -1146,14 +1146,14 @@
m_mappedAttributeDecls->insert((void*)entryType, attrNameDict);
}
else
- attrValueDict = attrNameDict->find((void*)attr->name().localName().implementation());
+ attrValueDict = attrNameDict->find((void*)attr->name().localName().impl());
if (!attrValueDict) {
attrValueDict = new QPtrDict<CSSMappedAttributeDeclarationImpl>;
if (entryType == ePersistent)
attrValueDict->setAutoDelete(true);
- attrNameDict->insert((void*)attr->name().localName().implementation(), attrValueDict);
+ attrNameDict->insert((void*)attr->name().localName().impl(), attrValueDict);
}
- attrValueDict->replace(attr->value().implementation(), decl);
+ attrValueDict->replace(attr->value().impl(), decl);
}
void StyledElementImpl::removeMappedAttributeDecl(MappedAttributeEntry entryType,
@@ -1165,10 +1165,10 @@
QPtrDict<QPtrDict<CSSMappedAttributeDeclarationImpl> >* attrNameDict = m_mappedAttributeDecls->find((void*)entryType);
if (!attrNameDict)
return;
- QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict = attrNameDict->find((void*)attrName.localName().implementation());
+ QPtrDict<CSSMappedAttributeDeclarationImpl>* attrValueDict = attrNameDict->find((void*)attrName.localName().impl());
if (!attrValueDict)
return;
- attrValueDict->remove(attrValue.implementation());
+ attrValueDict->remove(attrValue.impl());
}
void StyledElementImpl::invalidateStyleAttribute()
@@ -1250,7 +1250,7 @@
return;
DOMString classAttr = element->getDocument()->inCompatMode() ?
- (classStr.implementation()->isLower() ? classStr : DOMString(classStr.implementation()->lower())) :
+ (classStr.impl()->isLower() ? classStr : DOMString(classStr.impl()->lower())) :
classStr;
if (classAttr.find(' ') == -1 && classAttr.find('\n') == -1)
@@ -1377,7 +1377,7 @@
if (namedAttrMap) {
if (attr->isNull())
namedAttrMap->setID(nullAtom);
- else if (getDocument() && getDocument()->inCompatMode() && !attr->value().implementation()->isLower())
+ else if (getDocument() && getDocument()->inCompatMode() && !attr->value().impl()->isLower())
namedAttrMap->setID(AtomicString(attr->value().domString().lower()));
else
namedAttrMap->setID(attr->value());
@@ -1474,7 +1474,7 @@
if (!attr->decl()) createMappedDecl(attr);
// strip attribute garbage..
- DOMStringImpl* v = value.implementation();
+ DOMStringImpl* v = value.impl();
if ( v ) {
unsigned int l = 0;
1.5 +7 -7 WebCore/khtml/xml/dom_qname.cpp
Index: dom_qname.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_qname.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dom_qname.cpp 18 Jul 2005 21:44:29 -0000 1.4
+++ dom_qname.cpp 29 Aug 2005 21:29:23 -0000 1.5
@@ -81,9 +81,9 @@
struct QNameHash {
static unsigned hash(const QualifiedName::QualifiedNameImpl *name) {
- QualifiedNameComponents components = { name->m_prefix.implementation(),
- name->m_localName.implementation(),
- name->m_namespace.implementation() };
+ QualifiedNameComponents components = { name->m_prefix.impl(),
+ name->m_localName.impl(),
+ name->m_namespace.impl() };
return hashComponents(components);
}
static bool equal(const QualifiedName::QualifiedNameImpl *a, const QualifiedName::QualifiedNameImpl *b) { return a == b; }
@@ -95,9 +95,9 @@
inline bool equalComponents(QualifiedName::QualifiedNameImpl* const& name, const QualifiedNameComponents &components)
{
- return components.m_localName == name->m_localName.implementation() &&
- components.m_namespace == name->m_namespace.implementation() &&
- components.m_prefix == name->m_prefix.implementation();
+ return components.m_localName == name->m_localName.impl() &&
+ components.m_namespace == name->m_namespace.impl() &&
+ components.m_prefix == name->m_prefix.impl();
}
inline QualifiedName::QualifiedNameImpl *convertComponents(const QualifiedNameComponents& components, unsigned hash)
@@ -111,7 +111,7 @@
{
if (!gNameCache)
gNameCache = new QNameSet;
- QualifiedNameComponents components = { p.implementation(), l.implementation(), n.implementation() };
+ QualifiedNameComponents components = { p.impl(), l.impl(), n.impl() };
m_impl = *gNameCache->insert<QualifiedNameComponents, hashComponents, equalComponents, convertComponents>(components).first;
ref();
}
1.29 +6 -6 WebCore/khtml/xml/dom_textimpl.cpp
Index: dom_textimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_textimpl.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dom_textimpl.cpp 29 Aug 2005 18:00:46 -0000 1.28
+++ dom_textimpl.cpp 29 Aug 2005 21:29:24 -0000 1.29
@@ -44,7 +44,7 @@
CharacterDataImpl::CharacterDataImpl(DocumentPtr *doc, const DOMString &_text)
: NodeImpl(doc)
{
- str = _text.impl ? _text.impl : new DOMStringImpl((QChar*)0, 0);
+ str = _text.impl() ? _text.impl() : new DOMStringImpl((QChar*)0, 0);
str->ref();
}
@@ -66,9 +66,9 @@
return;
}
- if(str == _data.impl) return; // ### fire DOMCharacterDataModified if modified?
+ if(str == _data.impl()) return; // ### fire DOMCharacterDataModified if modified?
DOMStringImpl *oldStr = str;
- str = _data.impl;
+ str = _data.impl();
if(str) str->ref();
if (m_render)
(static_cast<RenderText*>(m_render))->setText(str);
@@ -107,7 +107,7 @@
DOMStringImpl *oldStr = str;
str = str->copy();
str->ref();
- str->append(arg.impl);
+ str->append(arg.impl());
if (m_render)
(static_cast<RenderText*>(m_render))->setTextWithOffset(str, oldStr->l, 0);
@@ -125,7 +125,7 @@
DOMStringImpl *oldStr = str;
str = str->copy();
str->ref();
- str->insert(arg.impl, offset);
+ str->insert(arg.impl(), offset);
if (m_render)
(static_cast<RenderText*>(m_render))->setTextWithOffset(str, offset, 0);
@@ -176,7 +176,7 @@
str = str->copy();
str->ref();
str->remove(offset,realCount);
- str->insert(arg.impl, offset);
+ str->insert(arg.impl(), offset);
if (m_render)
(static_cast<RenderText*>(m_render))->setTextWithOffset(str, offset, count);
1.15 +11 -11 WebCore/khtml/xml/dom_xmlimpl.cpp
Index: dom_xmlimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_xmlimpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dom_xmlimpl.cpp 5 May 2005 06:04:06 -0000 1.14
+++ dom_xmlimpl.cpp 29 Aug 2005 21:29:24 -0000 1.15
@@ -48,20 +48,20 @@
m_publicId = 0;
m_systemId = 0;
m_notationName = 0;
- m_name = _name.implementation();
+ m_name = _name.impl();
if (m_name)
m_name->ref();
}
EntityImpl::EntityImpl(DocumentPtr *doc, DOMString _publicId, DOMString _systemId, DOMString _notationName) : ContainerNodeImpl(doc)
{
- m_publicId = _publicId.implementation();
+ m_publicId = _publicId.impl();
if (m_publicId)
m_publicId->ref();
- m_systemId = _systemId.implementation();
+ m_systemId = _systemId.impl();
if (m_systemId)
m_systemId->ref();
- m_notationName = _notationName.implementation();
+ m_notationName = _notationName.impl();
if (m_notationName)
m_notationName->ref();
m_name = 0;
@@ -238,13 +238,13 @@
NotationImpl::NotationImpl(DocumentPtr *doc, DOMString _name, DOMString _publicId, DOMString _systemId) : ContainerNodeImpl(doc)
{
- m_name = _name.implementation();
+ m_name = _name.impl();
if (m_name)
m_name->ref();
- m_publicId = _publicId.implementation();
+ m_publicId = _publicId.impl();
if (m_publicId)
m_publicId->ref();
- m_systemId = _systemId.implementation();
+ m_systemId = _systemId.impl();
if (m_systemId)
m_systemId->ref();
}
@@ -312,10 +312,10 @@
ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentPtr *doc, DOMString _target, DOMString _data) : ContainerNodeImpl(doc)
{
- m_target = _target.implementation();
+ m_target = _target.impl();
if (m_target)
m_target->ref();
- m_data = _data.implementation();
+ m_data = _data.impl();
if (m_data)
m_data->ref();
m_sheet = 0;
@@ -358,7 +358,7 @@
if (m_data)
m_data->deref();
- m_data = _data.implementation();
+ m_data = _data.impl();
if (m_data)
m_data->ref();
}
@@ -444,7 +444,7 @@
DOMString newLocalHref = href.mid(1);
if (m_localHref)
m_localHref->deref();
- m_localHref = newLocalHref.implementation();
+ m_localHref = newLocalHref.impl();
if (m_localHref)
m_localHref->ref();
#ifdef KHTML_XSLT
1.41 +1 -1 WebCore/khtml/xml/xml_tokenizer.cpp
Index: xml_tokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xml_tokenizer.cpp 25 Aug 2005 23:13:56 -0000 1.40
+++ xml_tokenizer.cpp 29 Aug 2005 21:29:24 -0000 1.41
@@ -337,7 +337,7 @@
DOMString qn(atts.qName(i));
DOMString val(atts.value(i));
- newElement->setAttributeNS(uri.implementation(), qn.implementation(), val.implementation(), exceptioncode);
+ newElement->setAttributeNS(uri.impl(), qn.impl(), val.impl(), exceptioncode);
if (exceptioncode) // exception setting attributes
return;
}
1.7 +2 -2 WebCore/khtml/xsl/xslt_processorimpl.cpp
Index: xslt_processorimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xsl/xslt_processorimpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xslt_processorimpl.cpp 30 Jun 2005 05:57:17 -0000 1.6
+++ xslt_processorimpl.cpp 29 Aug 2005 21:29:27 -0000 1.7
@@ -171,9 +171,9 @@
if (method == NULL && resultDoc->type == XML_HTML_DOCUMENT_NODE)
method = (const xmlChar *)"html";
if (xmlStrEqual(method, (const xmlChar *)"html"))
- result = m_sourceDocument->implementation()->createHTMLDocument(view);
+ result = m_sourceDocument->impl()->createHTMLDocument(view);
else
- result = m_sourceDocument->implementation()->createDocument(view);
+ result = m_sourceDocument->impl()->createDocument(view);
result->attach();
result->setURL(m_sourceDocument->URL());
result->setBaseURL(m_sourceDocument->baseURL());
1.24 +1 -1 WebCore/kwq/DOM-CSS.mm
Index: DOM-CSS.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM-CSS.mm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DOM-CSS.mm 14 Jul 2005 02:22:11 -0000 1.23
+++ DOM-CSS.mm 29 Aug 2005 21:29:28 -0000 1.24
@@ -2548,7 +2548,7 @@
- (DOMCSSStyleDeclaration *)getComputedStyle:(DOMElement *)elt :(NSString *)pseudoElt
{
return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:
- AbstractViewImpl([self _documentImpl]).getComputedStyle([elt _elementImpl], DOMString(pseudoElt).implementation())];
+ AbstractViewImpl([self _documentImpl]).getComputedStyle([elt _elementImpl], DOMString(pseudoElt).impl())];
}
@end
1.45 +4 -4 WebCore/kwq/DOM.mm
Index: DOM.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOM.mm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- DOM.mm 29 Aug 2005 17:42:44 -0000 1.44
+++ DOM.mm 29 Aug 2005 21:29:28 -0000 1.45
@@ -340,7 +340,7 @@
int exceptionCode = 0;
DOMString prefixStr(prefix);
- [self _nodeImpl]->setPrefix(prefixStr.implementation(), exceptionCode);
+ [self _nodeImpl]->setPrefix(prefixStr.impl(), exceptionCode);
raiseOnDOMError(exceptionCode);
}
@@ -916,7 +916,7 @@
- (DOMImplementation *)implementation
{
- return [DOMImplementation _DOMImplementationWithImpl:[self _documentImpl]->implementation()];
+ return [DOMImplementation _DOMImplementationWithImpl:[self _documentImpl]->impl()];
}
- (DOMElement *)documentElement
@@ -1056,14 +1056,14 @@
{
ElementImpl *elementImpl = [elt _elementImpl];
DOMString pseudoEltString(pseudoElt);
- return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:[self _documentImpl]->defaultView()->getComputedStyle(elementImpl, pseudoEltString.implementation())];
+ return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:[self _documentImpl]->defaultView()->getComputedStyle(elementImpl, pseudoEltString.impl())];
}
- (DOMCSSStyleDeclaration *)getOverrideStyle:(DOMElement *)elt :(NSString *)pseudoElt
{
ElementImpl *elementImpl = [elt _elementImpl];
DOMString pseudoEltString(pseudoElt);
- return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:[self _documentImpl]->getOverrideStyle(elementImpl, pseudoEltString.implementation())];
+ return [DOMCSSStyleDeclaration _styleDeclarationWithImpl:[self _documentImpl]->getOverrideStyle(elementImpl, pseudoEltString.impl())];
}
@end
1.28 +2 -2 WebCore/kwq/DOMHTML.mm
Index: DOMHTML.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMHTML.mm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DOMHTML.mm 25 Aug 2005 23:13:57 -0000 1.27
+++ DOMHTML.mm 29 Aug 2005 21:29:28 -0000 1.28
@@ -1057,7 +1057,7 @@
- (void)setValue:(NSString *)value
{
DOMString s(value);
- [self _selectElementImpl]->setValue(s.implementation());
+ [self _selectElementImpl]->setValue(s.impl());
}
- (long)length
@@ -1255,7 +1255,7 @@
- (void)setValue:(NSString *)value
{
DOMString string = value;
- [self _optionElementImpl]->setValue(string.implementation());
+ [self _optionElementImpl]->setValue(string.impl());
}
@end
1.8 +3 -3 WebCore/kwq/DOMInternal.mm
Index: DOMInternal.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/DOMInternal.mm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMInternal.mm 9 Aug 2005 21:29:42 -0000 1.7
+++ DOMInternal.mm 29 Aug 2005 21:29:28 -0000 1.8
@@ -129,7 +129,7 @@
CFIndex size = CFStringGetLength(reinterpret_cast<CFStringRef>(str));
if (size == 0)
- impl = DOMStringImpl::empty();
+ m_impl = DOMStringImpl::empty();
else {
UniChar fixedSizeBuffer[1024];
UniChar *buffer;
@@ -139,12 +139,12 @@
buffer = fixedSizeBuffer;
}
CFStringGetCharacters(reinterpret_cast<CFStringRef>(str), CFRangeMake(0, size), buffer);
- impl = new DOMStringImpl(reinterpret_cast<const QChar *>(buffer), (uint)size);
+ m_impl = new DOMStringImpl(reinterpret_cast<const QChar *>(buffer), (uint)size);
if (buffer != fixedSizeBuffer) {
free(buffer);
}
}
- impl->ref();
+ m_impl->ref();
}
//------------------------------------------------------------------------------------------
1.5 +2 -2 WebCore/kwq/KWQFontFamily.mm
Index: KWQFontFamily.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQFontFamily.mm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KWQFontFamily.mm 4 Dec 2004 22:31:11 -0000 1.4
+++ KWQFontFamily.mm 29 Aug 2005 21:29:28 -0000 1.5
@@ -82,10 +82,10 @@
static CFMutableDictionaryRef families;
if (families == NULL)
families = CFDictionaryCreateMutable(NULL, 0, &CFDictionaryFamilyKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
- _NSFamily = (NSString *)CFDictionaryGetValue(families, _family.implementation());
+ _NSFamily = (NSString *)CFDictionaryGetValue(families, _family.impl());
if (!_NSFamily) {
_NSFamily = [NSString stringWithCharacters:(const unichar *)_family.unicode() length:_family.length()];
- CFDictionarySetValue(families, _family.implementation(), _NSFamily);
+ CFDictionarySetValue(families, _family.impl(), _NSFamily);
}
}
}
1.665 +1 -1 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.664
retrieving revision 1.665
diff -u -r1.664 -r1.665
--- KWQKHTMLPart.mm 25 Aug 2005 23:13:57 -0000 1.664
+++ KWQKHTMLPart.mm 29 Aug 2005 21:29:29 -0000 1.665
@@ -3479,7 +3479,7 @@
styleElement->ref();
- styleElement->setAttribute(styleAttr, d->m_typingStyle->cssText().implementation(), exceptionCode);
+ styleElement->setAttribute(styleAttr, d->m_typingStyle->cssText().impl(), exceptionCode);
ASSERT(exceptionCode == 0);
TextImpl *text = xmlDocImpl()->createEditingTextNode("");
More information about the webkit-changes
mailing list