Reviewed by Vicki.

	- renamed NodeBaseImpl to ContainerNodeImpl

        * khtml/ecma/kjs_dom.cpp:
	(DOMNodeProtoFunc::tryCall): Avoid use of NodeBaseImpl and avoid
	use of obsolete checkNoOwner call, use isAncestor instead.
        * khtml/html/html_elementimpl.cpp:
        (HTMLElementImpl::setOuterText): Avoid gratuitous use of
	NodeBaseImpl.
	* khtml/xml/dom_nodeimpl.cpp:
        (NodeBaseImpl::checkNoOwner): Removed.

	Ther rest is all just simple renaming.

	* khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::DocumentImpl):
        (DocumentImpl::attach):
        (DocumentImpl::detach):
        (DocumentFragmentImpl::DocumentFragmentImpl):
        * khtml/xml/dom_docimpl.h:
        * khtml/xml/dom_elementimpl.cpp:
        (AttrImpl::AttrImpl):
        (ElementImpl::ElementImpl):
        (ElementImpl::insertedIntoDocument):
        (ElementImpl::removedFromDocument):
        (ElementImpl::attach):
        (ElementImpl::dump):
        * khtml/xml/dom_elementimpl.h:
        * khtml/xml/dom_nodeimpl.cpp:
        (ContainerNodeImpl::ContainerNodeImpl):
        (ContainerNodeImpl::~ContainerNodeImpl):
        (ContainerNodeImpl::firstChild):
        (ContainerNodeImpl::lastChild):
        (ContainerNodeImpl::insertBefore):
        (ContainerNodeImpl::replaceChild):
        (ContainerNodeImpl::removeChild):
        (ContainerNodeImpl::removeChildren):
        (ContainerNodeImpl::appendChild):
        (ContainerNodeImpl::hasChildNodes):
        (ContainerNodeImpl::setFirstChild):
        (ContainerNodeImpl::setLastChild):
        (ContainerNodeImpl::checkSameDocument):
        (ContainerNodeImpl::checkIsChild):
        (ContainerNodeImpl::addChild):
        (ContainerNodeImpl::attach):
        (ContainerNodeImpl::detach):
        (ContainerNodeImpl::insertedIntoDocument):
        (ContainerNodeImpl::removedFromDocument):
        (ContainerNodeImpl::cloneChildNodes):
        (ContainerNodeImpl::getElementsByTagNameNS):
        (ContainerNodeImpl::getUpperLeftCorner):
        (ContainerNodeImpl::getLowerRightCorner):
        (ContainerNodeImpl::getRect):
        (ContainerNodeImpl::setFocus):
        (ContainerNodeImpl::setActive):
        (ContainerNodeImpl::childNodeCount):
        (ContainerNodeImpl::childNode):
        (ContainerNodeImpl::dispatchChildInsertedEvents):
        (ContainerNodeImpl::dispatchChildRemovalEvents):
        * khtml/xml/dom_nodeimpl.h:
        * khtml/xml/dom_xmlimpl.cpp:
        (DOM::EntityImpl::EntityImpl):
        (DOM::EntityReferenceImpl::EntityReferenceImpl):
        (DOM::NotationImpl::NotationImpl):
        (DOM::ProcessingInstructionImpl::ProcessingInstructionImpl):
        * khtml/xml/dom_xmlimpl.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9116 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 61fd50e15c958cbaa5c11ebdcb4594916543b345..b10bc8b4f0ba34b6f6ff6b55f8b5cb2b53654d8e 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,73 @@
+2005-05-02  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Vicki.
+
+       - renamed NodeBaseImpl to ContainerNodeImpl
+
+        * khtml/ecma/kjs_dom.cpp:
+       (DOMNodeProtoFunc::tryCall): Avoid use of NodeBaseImpl and avoid
+       use of obsolete checkNoOwner call, use isAncestor instead.
+        * khtml/html/html_elementimpl.cpp:
+        (HTMLElementImpl::setOuterText): Avoid gratuitous use of
+       NodeBaseImpl.
+       * khtml/xml/dom_nodeimpl.cpp:
+        (NodeBaseImpl::checkNoOwner): Removed.
+       
+       Ther rest is all just simple renaming.
+        
+       * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::DocumentImpl):
+        (DocumentImpl::attach):
+        (DocumentImpl::detach):
+        (DocumentFragmentImpl::DocumentFragmentImpl):
+        * khtml/xml/dom_docimpl.h:
+        * khtml/xml/dom_elementimpl.cpp:
+        (AttrImpl::AttrImpl):
+        (ElementImpl::ElementImpl):
+        (ElementImpl::insertedIntoDocument):
+        (ElementImpl::removedFromDocument):
+        (ElementImpl::attach):
+        (ElementImpl::dump):
+        * khtml/xml/dom_elementimpl.h:
+        * khtml/xml/dom_nodeimpl.cpp:
+        (ContainerNodeImpl::ContainerNodeImpl):
+        (ContainerNodeImpl::~ContainerNodeImpl):
+        (ContainerNodeImpl::firstChild):
+        (ContainerNodeImpl::lastChild):
+        (ContainerNodeImpl::insertBefore):
+        (ContainerNodeImpl::replaceChild):
+        (ContainerNodeImpl::removeChild):
+        (ContainerNodeImpl::removeChildren):
+        (ContainerNodeImpl::appendChild):
+        (ContainerNodeImpl::hasChildNodes):
+        (ContainerNodeImpl::setFirstChild):
+        (ContainerNodeImpl::setLastChild):
+        (ContainerNodeImpl::checkSameDocument):
+        (ContainerNodeImpl::checkIsChild):
+        (ContainerNodeImpl::addChild):
+        (ContainerNodeImpl::attach):
+        (ContainerNodeImpl::detach):
+        (ContainerNodeImpl::insertedIntoDocument):
+        (ContainerNodeImpl::removedFromDocument):
+        (ContainerNodeImpl::cloneChildNodes):
+        (ContainerNodeImpl::getElementsByTagNameNS):
+        (ContainerNodeImpl::getUpperLeftCorner):
+        (ContainerNodeImpl::getLowerRightCorner):
+        (ContainerNodeImpl::getRect):
+        (ContainerNodeImpl::setFocus):
+        (ContainerNodeImpl::setActive):
+        (ContainerNodeImpl::childNodeCount):
+        (ContainerNodeImpl::childNode):
+        (ContainerNodeImpl::dispatchChildInsertedEvents):
+        (ContainerNodeImpl::dispatchChildRemovalEvents):
+        * khtml/xml/dom_nodeimpl.h:
+        * khtml/xml/dom_xmlimpl.cpp:
+        (DOM::EntityImpl::EntityImpl):
+        (DOM::EntityReferenceImpl::EntityReferenceImpl):
+        (DOM::NotationImpl::NotationImpl):
+        (DOM::ProcessingInstructionImpl::ProcessingInstructionImpl):
+        * khtml/xml/dom_xmlimpl.h:
+
 2005-05-04  Vicki Murley  <vicki@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index f60ff370b73aa570e7c6e925ca56de9e285f2ccd..be9bc7baf3d342366ccfd6ed18d7b8b68804a090 100644 (file)
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -1,4 +1,6 @@
 all-am:
-       xcodebuild -buildstyle $(BUILDSTYLE)
+       xcodebuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
 clean-am:
-       xcodebuild clean
+       xcodebuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
+       rm -rf $(SYMROOTS)/WebCore.build
+       rm -rf $(SYMROOTS)/WebCore.framework

diff --git a/WebCore/khtml/ecma/kjs_dom.cpp b/WebCore/khtml/ecma/kjs_dom.cpp
index 98fdab1df9815e0d3a9e9db29404964c6acacbda..5854ab85cfaff43af40314448642e1967f6a6ec7 100644 (file)
--- a/WebCore/khtml/ecma/kjs_dom.cpp
+++ b/WebCore/khtml/ecma/kjs_dom.cpp
@@ -592,13 +592,11 @@ Value DOMNodeProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List &ar
       return getDOMNode(exec,node.replaceChild(toNode(args[0]), toNode(args[1])));
     case DOMNode::Contains:
     {
-        int exceptioncode=0;
        DOM::Node other = toNode(args[0]);
        if (!other.isNull() && node.nodeType()==DOM::Node::ELEMENT_NODE)
        {
-           DOM::NodeBaseImpl *impl = static_cast<DOM::NodeBaseImpl *>(node.handle());
-           bool retval = !impl->checkNoOwner(other.handle(),exceptioncode);
-           return Boolean(retval && exceptioncode == 0);
+           DOM::NodeImpl *impl = node.handle();
+           return Boolean(impl->isAncestor(other.handle()));
        }
         return Undefined();
     }

diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index fc5846df4c1d4f1bad6c4ac62c5d36ad053ff68f..1e375276ae275ad870d4c0414ad8909f0481bd72 100644 (file)
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -935,7 +935,7 @@ bool HTMLElementImpl::setOuterText( const DOMString &text )
             break;
     }
 
-    NodeBaseImpl *parent = static_cast<NodeBaseImpl *>(parentNode());
+    NodeImpl *parent = parentNode();
 
     if (!parent) {
        return false;

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 653c2b1b828a429c0ffd9d357c861b88f4ec780f..4974fb4131f72dcf532989d9f7dfa85048bf2c0c 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -262,7 +262,7 @@ QPtrList<DocumentImpl> * DocumentImpl::changedDocuments = 0;
 
 // KHTMLView might be 0
 DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
-    : NodeBaseImpl( new DocumentPtr() )
+    : ContainerNodeImpl( new DocumentPtr() )
       , m_domtree_version(0)
       , m_imageLoadEventTimer(0)
 #ifndef KHTML_NO_XBL
@@ -1188,7 +1188,7 @@ void DocumentImpl::attach()
     RenderObject* render = m_render;
     m_render = 0;
 
-    NodeBaseImpl::attach();
+    ContainerNodeImpl::attach();
     m_render = render;
 }
 
@@ -1222,7 +1222,7 @@ void DocumentImpl::detach()
     // FIXME: UNLOAD_EVENT will not dispatch due to deleting event listeners prior to closeURL(). 
     removeAllEventListenersFromAllNodes();
 
-    NodeBaseImpl::detach();
+    ContainerNodeImpl::detach();
 
     if ( render )
         render->detach();
@@ -3315,7 +3315,7 @@ DocumentImpl *DocumentImpl::topDocument() const
 
 // ----------------------------------------------------------------------------
 
-DocumentFragmentImpl::DocumentFragmentImpl(DocumentPtr *doc) : NodeBaseImpl(doc)
+DocumentFragmentImpl::DocumentFragmentImpl(DocumentPtr *doc) : ContainerNodeImpl(doc)
 {
 }
 

diff --git a/WebCore/khtml/xml/dom_docimpl.h b/WebCore/khtml/xml/dom_docimpl.h
index da8860b3e8d26e85ffc175a75b6f6f3bd49ee36c..8eee88c7a0b683dbb09f89e4757431bf94fde5f8 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.h
+++ b/WebCore/khtml/xml/dom_docimpl.h
@@ -175,7 +175,7 @@ protected:
 /**
  * @internal
  */
-class DocumentImpl : public QObject, public NodeBaseImpl
+class DocumentImpl : public QObject, public ContainerNodeImpl
 {
     Q_OBJECT
 public:
@@ -780,7 +780,7 @@ private:
 #endif
 };
 
-class DocumentFragmentImpl : public NodeBaseImpl
+class DocumentFragmentImpl : public ContainerNodeImpl
 {
 public:
     DocumentFragmentImpl(DocumentPtr *doc);

diff --git a/WebCore/khtml/xml/dom_elementimpl.cpp b/WebCore/khtml/xml/dom_elementimpl.cpp
index 8a061a603cf420ae758728ea9be9c7a499d0d079..5acdebc4016ae4ce6f197edb0a7c1b6e7ff596f1 100644 (file)
--- a/WebCore/khtml/xml/dom_elementimpl.cpp
+++ b/WebCore/khtml/xml/dom_elementimpl.cpp
@@ -61,7 +61,7 @@ void AttributeImpl::allocateImpl(ElementImpl* e) {
 }
 
 AttrImpl::AttrImpl(ElementImpl* element, DocumentPtr* docPtr, AttributeImpl* a)
-    : NodeBaseImpl(docPtr),
+    : ContainerNodeImpl(docPtr),
       m_element(element),
       m_attribute(a)
 {
@@ -190,7 +190,7 @@ DOMString AttrImpl::toString() const
 // -------------------------------------------------------------------------
 
 ElementImpl::ElementImpl(DocumentPtr *doc)
-    : NodeBaseImpl(doc)
+    : ContainerNodeImpl(doc)
 {
     namedAttrMap = 0;
     m_prefix = 0;
@@ -397,7 +397,7 @@ void ElementImpl::insertedIntoDocument()
 {
     // need to do superclass processing first so inDocument() is true
     // by the time we reach updateId
-    NodeBaseImpl::insertedIntoDocument();
+    ContainerNodeImpl::insertedIntoDocument();
 
     if (hasID()) {
         NamedAttrMapImpl *attrs = attributes(true);
@@ -422,7 +422,7 @@ void ElementImpl::removedFromDocument()
         }
     }
 
-    NodeBaseImpl::removedFromDocument();
+    ContainerNodeImpl::removedFromDocument();
 }
 
 void ElementImpl::attach()
@@ -430,7 +430,7 @@ void ElementImpl::attach()
 #if SPEED_DEBUG < 1
     createRendererIfNeeded();
 #endif
-    NodeBaseImpl::attach();
+    ContainerNodeImpl::attach();
 }
 
 void ElementImpl::recalcStyle( StyleChange change )
@@ -628,7 +628,7 @@ void ElementImpl::dump(QTextStream *stream, QString ind) const
         }
     }
 
-    NodeBaseImpl::dump(stream,ind);
+    ContainerNodeImpl::dump(stream,ind);
 }
 #endif
 

diff --git a/WebCore/khtml/xml/dom_elementimpl.h b/WebCore/khtml/xml/dom_elementimpl.h
index 7a207d4ba5adf2df7ea1a767b010afad5ae63971..60ad1f472d1f8eeff160d5593b3f66cbc89482c5 100644 (file)
--- a/WebCore/khtml/xml/dom_elementimpl.h
+++ b/WebCore/khtml/xml/dom_elementimpl.h
@@ -99,7 +99,7 @@ protected:
 // is to dynamically allocate a textchild and store the
 // resulting nodevalue in the AttributeImpl upon
 // destruction. however, this is not yet implemented.
-class AttrImpl : public NodeBaseImpl
+class AttrImpl : public ContainerNodeImpl
 {
     friend class ElementImpl;
     friend class NamedAttrMapImpl;
@@ -148,7 +148,7 @@ protected:
 };
 
 
-class ElementImpl : public NodeBaseImpl
+class ElementImpl : public ContainerNodeImpl
 {
     friend class DocumentImpl;
     friend class NamedAttrMapImpl;

diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index f81552c54b3c39a4a97a15c16e3097bf0ede77d3..ed8ea96d03b34acd143dc04fc4a07e0e4323317a 100644 (file)
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -1572,16 +1572,16 @@ void NodeImpl::formatForDebugger(char *buffer, unsigned length) const
 
 //-------------------------------------------------------------------------
 
-NodeBaseImpl::NodeBaseImpl(DocumentPtr *doc)
+ContainerNodeImpl::ContainerNodeImpl(DocumentPtr *doc)
     : NodeImpl(doc)
 {
     _first = _last = 0;
 }
 
 
-NodeBaseImpl::~NodeBaseImpl()
+ContainerNodeImpl::~ContainerNodeImpl()
 {
-    //kdDebug( 6020 ) << "NodeBaseImpl destructor" << endl;
+    //kdDebug( 6020 ) << "ContainerNodeImpl destructor" << endl;
 
     // Avoid deep recursion when destroying the node tree.
     static bool alreadyInsideDestructor; 
@@ -1632,17 +1632,17 @@ NodeBaseImpl::~NodeBaseImpl()
 }
 
 
-NodeImpl *NodeBaseImpl::firstChild() const
+NodeImpl *ContainerNodeImpl::firstChild() const
 {
     return _first;
 }
 
-NodeImpl *NodeBaseImpl::lastChild() const
+NodeImpl *ContainerNodeImpl::lastChild() const
 {
     return _last;
 }
 
-NodeImpl *NodeBaseImpl::insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode )
+NodeImpl *ContainerNodeImpl::insertBefore ( NodeImpl *newChild, NodeImpl *refChild, int &exceptioncode )
 {
     exceptioncode = 0;
 
@@ -1715,7 +1715,7 @@ NodeImpl *NodeBaseImpl::insertBefore ( NodeImpl *newChild, NodeImpl *refChild, i
     return newChild;
 }
 
-NodeImpl *NodeBaseImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
+NodeImpl *ContainerNodeImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, int &exceptioncode )
 {
     exceptioncode = 0;
 
@@ -1785,7 +1785,7 @@ NodeImpl *NodeBaseImpl::replaceChild ( NodeImpl *newChild, NodeImpl *oldChild, i
     return oldChild;
 }
 
-NodeImpl *NodeBaseImpl::removeChild ( NodeImpl *oldChild, int &exceptioncode )
+NodeImpl *ContainerNodeImpl::removeChild ( NodeImpl *oldChild, int &exceptioncode )
 {
     exceptioncode = 0;
 
@@ -1843,7 +1843,7 @@ NodeImpl *NodeBaseImpl::removeChild ( NodeImpl *oldChild, int &exceptioncode )
     return oldChild;
 }
 
-void NodeBaseImpl::removeChildren()
+void ContainerNodeImpl::removeChildren()
 {
     int exceptionCode;
     while (NodeImpl *n = _first) {
@@ -1874,7 +1874,7 @@ void NodeBaseImpl::removeChildren()
 }
 
 
-NodeImpl *NodeBaseImpl::appendChild ( NodeImpl *newChild, int &exceptioncode )
+NodeImpl *ContainerNodeImpl::appendChild ( NodeImpl *newChild, int &exceptioncode )
 {
     exceptioncode = 0;
 
@@ -1941,24 +1941,24 @@ NodeImpl *NodeBaseImpl::appendChild ( NodeImpl *newChild, int &exceptioncode )
     return newChild;
 }
 
-bool NodeBaseImpl::hasChildNodes (  ) const
+bool ContainerNodeImpl::hasChildNodes (  ) const
 {
     return _first != 0;
 }
 
 // not part of the DOM
-void NodeBaseImpl::setFirstChild(NodeImpl *child)
+void ContainerNodeImpl::setFirstChild(NodeImpl *child)
 {
     _first = child;
 }
 
-void NodeBaseImpl::setLastChild(NodeImpl *child)
+void ContainerNodeImpl::setLastChild(NodeImpl *child)
 {
     _last = child;
 }
 
 // check for same source document:
-bool NodeBaseImpl::checkSameDocument( NodeImpl *newChild, int &exceptioncode )
+bool ContainerNodeImpl::checkSameDocument( NodeImpl *newChild, int &exceptioncode )
 {
     exceptioncode = 0;
     DocumentImpl *ownerDocThis = getDocument();
@@ -1971,22 +1971,8 @@ bool NodeBaseImpl::checkSameDocument( NodeImpl *newChild, int &exceptioncode )
     return false;
 }
 
-// check for being (grand-..)father:
-// ### remove in favor or isAncestor()
-bool NodeBaseImpl::checkNoOwner( NodeImpl *newChild, int &exceptioncode )
-{
-  //check if newChild is parent of this...
-  NodeImpl *n;
-  for( n = this; (n != getDocument()) && (n!= 0); n = n->parentNode() )
-      if(n == newChild) {
-          exceptioncode = DOMException::HIERARCHY_REQUEST_ERR;
-          return true;
-      }
-  return false;
-}
-
 // check for being child:
-bool NodeBaseImpl::checkIsChild( NodeImpl *oldChild, int &exceptioncode )
+bool ContainerNodeImpl::checkIsChild( NodeImpl *oldChild, int &exceptioncode )
 {
     if(!oldChild || oldChild->parentNode() != this) {
         exceptioncode = DOMException::NOT_FOUND_ERR;
@@ -1995,7 +1981,7 @@ bool NodeBaseImpl::checkIsChild( NodeImpl *oldChild, int &exceptioncode )
     return false;
 }
 
-NodeImpl *NodeBaseImpl::addChild(NodeImpl *newChild)
+NodeImpl *ContainerNodeImpl::addChild(NodeImpl *newChild)
 {
     // do not add applyChanges here! This function is only used during parsing
 
@@ -2031,7 +2017,7 @@ NodeImpl *NodeBaseImpl::addChild(NodeImpl *newChild)
     return this;
 }
 
-void NodeBaseImpl::attach()
+void ContainerNodeImpl::attach()
 {
     NodeImpl *child = _first;
     while(child != 0)
@@ -2042,7 +2028,7 @@ void NodeBaseImpl::attach()
     NodeImpl::attach();
 }
 
-void NodeBaseImpl::detach()
+void ContainerNodeImpl::detach()
 {
     NodeImpl *child = _first;
     while(child != 0)
@@ -2054,21 +2040,21 @@ void NodeBaseImpl::detach()
     NodeImpl::detach();
 }
 
-void NodeBaseImpl::insertedIntoDocument()
+void ContainerNodeImpl::insertedIntoDocument()
 {
     NodeImpl::insertedIntoDocument();
     for (NodeImpl *child = _first; child; child = child->nextSibling())
         child->insertedIntoDocument();
 }
 
-void NodeBaseImpl::removedFromDocument()
+void ContainerNodeImpl::removedFromDocument()
 {
     NodeImpl::removedFromDocument();
     for (NodeImpl *child = _first; child; child = child->nextSibling())
         child->removedFromDocument();
 }
 
-void NodeBaseImpl::cloneChildNodes(NodeImpl *clone)
+void ContainerNodeImpl::cloneChildNodes(NodeImpl *clone)
 {
     int exceptioncode = 0;
     NodeImpl *n;
@@ -2078,7 +2064,7 @@ void NodeBaseImpl::cloneChildNodes(NodeImpl *clone)
     }
 }
 
-NodeListImpl* NodeBaseImpl::getElementsByTagNameNS ( DOMStringImpl* namespaceURI,
+NodeListImpl* ContainerNodeImpl::getElementsByTagNameNS ( DOMStringImpl* namespaceURI,
                                                      DOMStringImpl* localName )
 {
     if (!localName) return 0;
@@ -2102,7 +2088,7 @@ NodeListImpl* NodeBaseImpl::getElementsByTagNameNS ( DOMStringImpl* namespaceURI
 
 // I don't like this way of implementing the method, but I didn't find any
 // other way. Lars
-bool NodeBaseImpl::getUpperLeftCorner(int &xPos, int &yPos) const
+bool ContainerNodeImpl::getUpperLeftCorner(int &xPos, int &yPos) const
 {
     if (!m_render)
         return false;
@@ -2141,7 +2127,7 @@ bool NodeBaseImpl::getUpperLeftCorner(int &xPos, int &yPos) const
     return true;
 }
 
-bool NodeBaseImpl::getLowerRightCorner(int &xPos, int &yPos) const
+bool ContainerNodeImpl::getLowerRightCorner(int &xPos, int &yPos) const
 {
     if (!m_render)
         return false;
@@ -2183,7 +2169,7 @@ bool NodeBaseImpl::getLowerRightCorner(int &xPos, int &yPos) const
     return true;
 }
 
-QRect NodeBaseImpl::getRect() const
+QRect ContainerNodeImpl::getRect() const
 {
     int xPos, yPos;
     if (!getUpperLeftCorner(xPos,yPos))
@@ -2212,7 +2198,7 @@ QRect NodeBaseImpl::getRect() const
     return QRect(xPos, yPos, xEnd - xPos, yEnd - yPos);
 }
 
-void NodeBaseImpl::setFocus(bool received)
+void ContainerNodeImpl::setFocus(bool received)
 {
     if (m_focused == received) return;
 
@@ -2226,7 +2212,7 @@ void NodeBaseImpl::setFocus(bool received)
     setChanged();
 }
 
-void NodeBaseImpl::setActive(bool down)
+void ContainerNodeImpl::setActive(bool down)
 {
     if (down == active()) return;
 
@@ -2237,7 +2223,7 @@ void NodeBaseImpl::setActive(bool down)
         setChanged();
 }
 
-unsigned long NodeBaseImpl::childNodeCount() const
+unsigned long ContainerNodeImpl::childNodeCount() const
 {
     unsigned long count = 0;
     NodeImpl *n;
@@ -2246,7 +2232,7 @@ unsigned long NodeBaseImpl::childNodeCount() const
     return count;
 }
 
-NodeImpl *NodeBaseImpl::childNode(unsigned long index)
+NodeImpl *ContainerNodeImpl::childNode(unsigned long index)
 {
     unsigned long i;
     NodeImpl *n = firstChild();
@@ -2255,7 +2241,7 @@ NodeImpl *NodeBaseImpl::childNode(unsigned long index)
     return n;
 }
 
-void NodeBaseImpl::dispatchChildInsertedEvents( NodeImpl *child, int &exceptioncode )
+void ContainerNodeImpl::dispatchChildInsertedEvents( NodeImpl *child, int &exceptioncode )
 {
     NodeImpl *p = this;
     while (p->parentNode())
@@ -2287,7 +2273,8 @@ void NodeBaseImpl::dispatchChildInsertedEvents( NodeImpl *child, int &exceptionc
     }
 }
 
-void NodeBaseImpl::dispatchChildRemovalEvents( NodeImpl *child, int &exceptioncode )
+// base class for nodes that may have children
+void ContainerNodeImpl::dispatchChildRemovalEvents( NodeImpl *child, int &exceptioncode )
 {
     // Dispatch pre-removal mutation events
     getDocument()->notifyBeforeNodeRemoval(child); // ### use events instead

diff --git a/WebCore/khtml/xml/dom_nodeimpl.h b/WebCore/khtml/xml/dom_nodeimpl.h
index b29d7b6f5306a23f556a61e694df9e1305a42d99..307d17f96c4272527397e559aa10b2ad7c990e06 100644 (file)
--- a/WebCore/khtml/xml/dom_nodeimpl.h
+++ b/WebCore/khtml/xml/dom_nodeimpl.h
@@ -496,12 +496,11 @@ protected:
     // 3 bits unused
 };
 
-// this is the full Node Implementation with parents and children.
-class NodeBaseImpl : public NodeImpl
+class ContainerNodeImpl : public NodeImpl
 {
 public:
-    NodeBaseImpl(DocumentPtr *doc);
-    virtual ~NodeBaseImpl();
+    ContainerNodeImpl(DocumentPtr *doc);
+    virtual ~ContainerNodeImpl();
 
     // DOM methods overridden from  parent classes
     virtual NodeImpl *firstChild() const;
@@ -537,9 +536,6 @@ public:
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
     
-    // check for being (grand-..)father:
-    bool checkNoOwner( NodeImpl *other, int &exceptioncode );
-
 //protected:
     NodeImpl *_first;
     NodeImpl *_last;

diff --git a/WebCore/khtml/xml/dom_xmlimpl.cpp b/WebCore/khtml/xml/dom_xmlimpl.cpp
index 6e8f87abb15745acbcec99e6679caf1364d69b57..de4d985741e84b6e7220fa4eb5ef9ca6cd38f38c 100644 (file)
--- a/WebCore/khtml/xml/dom_xmlimpl.cpp
+++ b/WebCore/khtml/xml/dom_xmlimpl.cpp
@@ -35,7 +35,7 @@ using khtml::parseAttributes;
 
 namespace DOM {
 
-EntityImpl::EntityImpl(DocumentPtr *doc) : NodeBaseImpl(doc)
+EntityImpl::EntityImpl(DocumentPtr *doc) : ContainerNodeImpl(doc)
 {
     m_publicId = 0;
     m_systemId = 0;
@@ -43,7 +43,7 @@ EntityImpl::EntityImpl(DocumentPtr *doc) : NodeBaseImpl(doc)
     m_name = 0;
 }
 
-EntityImpl::EntityImpl(DocumentPtr *doc, DOMString _name) : NodeBaseImpl(doc)
+EntityImpl::EntityImpl(DocumentPtr *doc, DOMString _name) : ContainerNodeImpl(doc)
 {
     m_publicId = 0;
     m_systemId = 0;
@@ -53,7 +53,7 @@ EntityImpl::EntityImpl(DocumentPtr *doc, DOMString _name) : NodeBaseImpl(doc)
         m_name->ref();
 }
 
-EntityImpl::EntityImpl(DocumentPtr *doc, DOMString _publicId, DOMString _systemId, DOMString _notationName) : NodeBaseImpl(doc)
+EntityImpl::EntityImpl(DocumentPtr *doc, DOMString _publicId, DOMString _systemId, DOMString _notationName) : ContainerNodeImpl(doc)
 {
     m_publicId = _publicId.implementation();
     if (m_publicId)
@@ -163,12 +163,12 @@ DOMString EntityImpl::toString() const
 
 // -------------------------------------------------------------------------
 
-EntityReferenceImpl::EntityReferenceImpl(DocumentPtr *doc) : NodeBaseImpl(doc)
+EntityReferenceImpl::EntityReferenceImpl(DocumentPtr *doc) : ContainerNodeImpl(doc)
 {
     m_entityName = 0;
 }
 
-EntityReferenceImpl::EntityReferenceImpl(DocumentPtr *doc, DOMStringImpl *_entityName) : NodeBaseImpl(doc)
+EntityReferenceImpl::EntityReferenceImpl(DocumentPtr *doc, DOMStringImpl *_entityName) : ContainerNodeImpl(doc)
 {
     m_entityName = _entityName;
     if (m_entityName)
@@ -229,14 +229,14 @@ DOMString EntityReferenceImpl::toString() const
 
 // -------------------------------------------------------------------------
 
-NotationImpl::NotationImpl(DocumentPtr *doc) : NodeBaseImpl(doc)
+NotationImpl::NotationImpl(DocumentPtr *doc) : ContainerNodeImpl(doc)
 {
     m_publicId = 0;
     m_systemId = 0;
     m_name = 0;
 }
 
-NotationImpl::NotationImpl(DocumentPtr *doc, DOMString _name, DOMString _publicId, DOMString _systemId) : NodeBaseImpl(doc)
+NotationImpl::NotationImpl(DocumentPtr *doc, DOMString _name, DOMString _publicId, DOMString _systemId) : ContainerNodeImpl(doc)
 {
     m_name = _name.implementation();
     if (m_name)
@@ -297,7 +297,7 @@ bool NotationImpl::childTypeAllowed( unsigned short /*type*/ )
 // ### need a way of updating these properly whenever child nodes of the processing instruction
 // change or are added/removed
 
-ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentPtr *doc) : NodeBaseImpl(doc)
+ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentPtr *doc) : ContainerNodeImpl(doc)
 {
     m_target = 0;
     m_data = 0;
@@ -310,7 +310,7 @@ ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentPtr *doc) : NodeBas
 #endif
 }
 
-ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentPtr *doc, DOMString _target, DOMString _data) : NodeBaseImpl(doc)
+ProcessingInstructionImpl::ProcessingInstructionImpl(DocumentPtr *doc, DOMString _target, DOMString _data) : ContainerNodeImpl(doc)
 {
     m_target = _target.implementation();
     if (m_target)

diff --git a/WebCore/khtml/xml/dom_xmlimpl.h b/WebCore/khtml/xml/dom_xmlimpl.h
index fc8101b81176f1c79a6eabdeebb3f74ffe435c69..7c0f0493a01731c8504287a7871d836e5e928958 100644 (file)
--- a/WebCore/khtml/xml/dom_xmlimpl.h
+++ b/WebCore/khtml/xml/dom_xmlimpl.h
@@ -40,7 +40,7 @@ class DOMString;
 class ProcessingInstruction;
 #endif
 
-class EntityImpl : public NodeBaseImpl
+class EntityImpl : public ContainerNodeImpl
 {
 public:
     EntityImpl(DocumentPtr *doc);
@@ -74,7 +74,7 @@ protected:
 };
 
 
-class EntityReferenceImpl : public NodeBaseImpl
+class EntityReferenceImpl : public ContainerNodeImpl
 {
 public:
     EntityReferenceImpl(DocumentPtr *doc);
@@ -96,7 +96,7 @@ protected:
     DOMStringImpl *m_entityName;
 };
 
-class NotationImpl : public NodeBaseImpl
+class NotationImpl : public ContainerNodeImpl
 {
 public:
     NotationImpl(DocumentPtr *doc);
@@ -125,7 +125,7 @@ protected:
 };
 
 
-class ProcessingInstructionImpl : public NodeBaseImpl, private khtml::CachedObjectClient
+class ProcessingInstructionImpl : public ContainerNodeImpl, private khtml::CachedObjectClient
 {
 public:
     ProcessingInstructionImpl(DocumentPtr *doc);