[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dglazkov at chromium.org
dglazkov at chromium.org
Wed Dec 22 16:02:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e43caa78d4a309820de9bf79c15d6e77ad12bbf0
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 18 00:20:10 2010 +0000
Converge means of querying a parent node into one way, which is Node::parentNode.
https://bugs.webkit.org/show_bug.cgi?id=49686
Reviewed by Darin Adler.
WebCore:
No change in behavior, so no new tests.
* accessibility/AccessibilityObject.cpp:
(WebCore::renderListItemContainerForNode): Changed to use parentNode.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::mouseButtonListener): Ditto.
(WebCore::siblingWithAriaRole): Ditto.
(WebCore::AccessibilityRenderObject::getDocumentLinks): Ditto.
(WebCore::AccessibilityRenderObject::accessibilityImageMapHitTest): Ditto.
* accessibility/mac/AccessibilityObjectWrapper.mm: Ditto.
(blockquoteLevel): Ditto.
* bindings/v8/V8GCController.cpp:
(WebCore::ObjectGrouperVisitor::visitDOMWrapper): Ditto.
* dom/ContainerNode.cpp: Ditto.
(WebCore::ContainerNode::insertBefore): Ditto.
(WebCore::ContainerNode::insertBeforeCommon): Ditto.
(WebCore::ContainerNode::replaceChild): Ditto.
(WebCore::ContainerNode::removeChild): Ditto.
(WebCore::ContainerNode::appendChild): Ditto.
(WebCore::ContainerNode::parserAddChild): Ditto.
* dom/DocumentType.cpp:
(WebCore::DocumentType::insertedIntoDocument): Ditto.
* dom/Element.cpp:
(WebCore::Element::computeInheritedLanguage): Ditto.
* dom/MouseRelatedEvent.cpp:
(WebCore::MouseRelatedEvent::receivedTarget): Ditto.
* dom/Position.cpp:
(WebCore::Position::isCandidate): Changed to use parentNode.
* dom/PositionIterator.cpp:
(WebCore::PositionIterator::isCandidate): Ditto.
* editing/AppendNodeCommand.cpp:
(WebCore::AppendNodeCommand::AppendNodeCommand): Ditto.
* editing/ApplyStyleCommand.cpp:
(WebCore::dummySpanAncestorForNode): Ditto.
(WebCore::ApplyStyleCommand::splitAncestorsWithUnicodeBidi): Ditto.
(WebCore::ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock): Ditto.
(WebCore::highestEmbeddingAncestor): Ditto.
(WebCore::ApplyStyleCommand::splitTextElementAtEnd): Ditto.
(WebCore::ApplyStyleCommand::mergeStartWithPreviousIfIdentical): Ditto.
(WebCore::ApplyStyleCommand::mergeEndWithNextIfIdentical): Ditto.
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::splitTreeToNode): Ditto.
* editing/DeleteSelectionCommand.cpp:
(WebCore::updatePositionForNodeRemoval): Ditto.
* editing/Editor.cpp:
(WebCore::Editor::textDirectionForSelection): Ditto.
* editing/MergeIdenticalElementsCommand.cpp:
(WebCore::MergeIdenticalElementsCommand::doUnapply): Ditto.
* editing/htmlediting.cpp:
(WebCore::isEmptyTableCell): Ditto.
* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::serializeNodes): Ditto.
* editing/visible_units.cpp:
(WebCore::previousLinePosition): Ditto.
(WebCore::nextLinePosition): Ditto.
* html/HTMLAreaElement.cpp:
(WebCore::HTMLAreaElement::imageElement): Ditto.
* html/HTMLElement.cpp:
(WebCore::HTMLElement::setOuterHTML): Ditto.
(WebCore::HTMLElement::insertAdjacent): Ditto.
(WebCore::HTMLElement::supportsFocus): Ditto.
* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::insertedIntoDocument): Ditto.
(WebCore::HTMLEmbedElement::attributeChanged): Ditto.
* html/HTMLTableElement.cpp:
(WebCore::HTMLTableElement::insertRow): Ditto.
* html/HTMLTableRowsCollection.cpp: Ditto.
(WebCore::isInHead): Ditto.
(WebCore::isInBody): Ditto.
(WebCore::isInFoot): Ditto.
(WebCore::HTMLTableRowsCollection::rowAfter): Ditto.
* html/HTMLViewSourceDocument.cpp:
(WebCore::HTMLViewSourceDocument::addRange): Ditto.
* html/MediaDocument.cpp:
(WebCore::MediaDocument::replaceMediaElementTimerFired): Ditto.
* html/parser/HTMLConstructionSite.cpp:
(WebCore::HTMLConstructionSite::attach): Ditto.
(WebCore::HTMLConstructionSite::findFosterSite): Ditto.
* html/parser/HTMLTreeBuilder.cpp:
* page/FocusController.cpp:
(WebCore::FocusController::findFocusableNodeInDirection): Ditto.
* rendering/MediaControlElements.cpp:
(WebCore::MediaControlElement::rendererIsNeeded): Ditto.
(WebCore::MediaControlElement::attach): Ditto.
(WebCore::MediaControlElement::updateStyle): Ditto.
(WebCore::MediaControlInputElement::rendererIsNeeded): Ditto.
(WebCore::MediaControlInputElement::attach): Ditto.
(WebCore::MediaControlInputElement::updateStyle): Ditto.
* rendering/RenderSVGGradientStop.cpp:
(WebCore::RenderSVGGradientStop::gradientElement): Ditto.
* svg/SVGAElement.cpp:
(WebCore::SVGAElement::createRenderer): Ditto.
(WebCore::SVGAElement::childShouldCreateRenderer): Ditto.
* svg/SVGFELightElement.cpp:
(WebCore::SVGFELightElement::svgAttributeChanged): Ditto.
(WebCore::SVGFELightElement::childrenChanged): Ditto.
* svg/SVGFEMergeNodeElement.cpp:
(WebCore::SVGFEMergeNodeElement::svgAttributeChanged): Ditto.
* svg/SVGLength.cpp:
(WebCore::SVGLength::determineViewport): Ditto.
* svg/SVGStyledElement.cpp:
(WebCore::SVGStyledElement::updateRelativeLengthsInformation): Ditto.
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::removeDisallowedElementsFromSubtree): Ditto.
* svg/animation/SVGSMILElement.cpp:
(WebCore::SVGSMILElement::insertedIntoDocument): Ditto.
* xml/XPathNodeSet.cpp:
(WebCore::XPath::NodeSet::sort): Ditto.
* xml/XPathStep.cpp:
(WebCore::XPath::Step::nodesInAxis): Ditto.
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::xsltStylesheetPointer): Ditto.
WebKit/chromium:
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::insertStyleText): Changed to use parentNode.
(WebKit::WebFrameImpl::setFindEndstateFocusAndSelection): Ditto.
WebKit/qt:
* Api/qwebelement.cpp:
(QWebElement::prependOutside): Changed to use parentNode.
(QWebElement::appendOutside): Ditto.
(QWebElement::encloseContentsWith): Ditto.
(QWebElement::encloseWith): Ditto.
WebKit2:
* WebProcess/WebPage/WebPage.cpp: Changed to use parentNode.
(WebKit::WebPage::findZoomableAreaForPoint): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72259 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4f673ac..d3fcb06 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,123 @@
+2010-11-17 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Converge means of querying a parent node into one way, which is Node::parentNode.
+ https://bugs.webkit.org/show_bug.cgi?id=49686
+
+ No change in behavior, so no new tests.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::renderListItemContainerForNode): Changed to use parentNode.
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::mouseButtonListener): Ditto.
+ (WebCore::siblingWithAriaRole): Ditto.
+ (WebCore::AccessibilityRenderObject::getDocumentLinks): Ditto.
+ (WebCore::AccessibilityRenderObject::accessibilityImageMapHitTest): Ditto.
+ * accessibility/mac/AccessibilityObjectWrapper.mm: Ditto.
+ (blockquoteLevel): Ditto.
+ * bindings/v8/V8GCController.cpp:
+ (WebCore::ObjectGrouperVisitor::visitDOMWrapper): Ditto.
+ * dom/ContainerNode.cpp: Ditto.
+ (WebCore::ContainerNode::insertBefore): Ditto.
+ (WebCore::ContainerNode::insertBeforeCommon): Ditto.
+ (WebCore::ContainerNode::replaceChild): Ditto.
+ (WebCore::ContainerNode::removeChild): Ditto.
+ (WebCore::ContainerNode::appendChild): Ditto.
+ (WebCore::ContainerNode::parserAddChild): Ditto.
+ * dom/DocumentType.cpp:
+ (WebCore::DocumentType::insertedIntoDocument): Ditto.
+ * dom/Element.cpp:
+ (WebCore::Element::computeInheritedLanguage): Ditto.
+ * dom/MouseRelatedEvent.cpp:
+ (WebCore::MouseRelatedEvent::receivedTarget): Ditto.
+ * dom/Position.cpp:
+ (WebCore::Position::isCandidate): Changed to use parentNode.
+ * dom/PositionIterator.cpp:
+ (WebCore::PositionIterator::isCandidate): Ditto.
+ * editing/AppendNodeCommand.cpp:
+ (WebCore::AppendNodeCommand::AppendNodeCommand): Ditto.
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::dummySpanAncestorForNode): Ditto.
+ (WebCore::ApplyStyleCommand::splitAncestorsWithUnicodeBidi): Ditto.
+ (WebCore::ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock): Ditto.
+ (WebCore::highestEmbeddingAncestor): Ditto.
+ (WebCore::ApplyStyleCommand::splitTextElementAtEnd): Ditto.
+ (WebCore::ApplyStyleCommand::mergeStartWithPreviousIfIdentical): Ditto.
+ (WebCore::ApplyStyleCommand::mergeEndWithNextIfIdentical): Ditto.
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::splitTreeToNode): Ditto.
+ * editing/DeleteSelectionCommand.cpp:
+ (WebCore::updatePositionForNodeRemoval): Ditto.
+ * editing/Editor.cpp:
+ (WebCore::Editor::textDirectionForSelection): Ditto.
+ * editing/MergeIdenticalElementsCommand.cpp:
+ (WebCore::MergeIdenticalElementsCommand::doUnapply): Ditto.
+ * editing/htmlediting.cpp:
+ (WebCore::isEmptyTableCell): Ditto.
+ * editing/markup.cpp:
+ (WebCore::StyledMarkupAccumulator::serializeNodes): Ditto.
+ * editing/visible_units.cpp:
+ (WebCore::previousLinePosition): Ditto.
+ (WebCore::nextLinePosition): Ditto.
+ * html/HTMLAreaElement.cpp:
+ (WebCore::HTMLAreaElement::imageElement): Ditto.
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::setOuterHTML): Ditto.
+ (WebCore::HTMLElement::insertAdjacent): Ditto.
+ (WebCore::HTMLElement::supportsFocus): Ditto.
+ * html/HTMLEmbedElement.cpp:
+ (WebCore::HTMLEmbedElement::insertedIntoDocument): Ditto.
+ (WebCore::HTMLEmbedElement::attributeChanged): Ditto.
+ * html/HTMLTableElement.cpp:
+ (WebCore::HTMLTableElement::insertRow): Ditto.
+ * html/HTMLTableRowsCollection.cpp: Ditto.
+ (WebCore::isInHead): Ditto.
+ (WebCore::isInBody): Ditto.
+ (WebCore::isInFoot): Ditto.
+ (WebCore::HTMLTableRowsCollection::rowAfter): Ditto.
+ * html/HTMLViewSourceDocument.cpp:
+ (WebCore::HTMLViewSourceDocument::addRange): Ditto.
+ * html/MediaDocument.cpp:
+ (WebCore::MediaDocument::replaceMediaElementTimerFired): Ditto.
+ * html/parser/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::attach): Ditto.
+ (WebCore::HTMLConstructionSite::findFosterSite): Ditto.
+ * html/parser/HTMLTreeBuilder.cpp:
+ * page/FocusController.cpp:
+ (WebCore::FocusController::findFocusableNodeInDirection): Ditto.
+ * rendering/MediaControlElements.cpp:
+ (WebCore::MediaControlElement::rendererIsNeeded): Ditto.
+ (WebCore::MediaControlElement::attach): Ditto.
+ (WebCore::MediaControlElement::updateStyle): Ditto.
+ (WebCore::MediaControlInputElement::rendererIsNeeded): Ditto.
+ (WebCore::MediaControlInputElement::attach): Ditto.
+ (WebCore::MediaControlInputElement::updateStyle): Ditto.
+ * rendering/RenderSVGGradientStop.cpp:
+ (WebCore::RenderSVGGradientStop::gradientElement): Ditto.
+ * svg/SVGAElement.cpp:
+ (WebCore::SVGAElement::createRenderer): Ditto.
+ (WebCore::SVGAElement::childShouldCreateRenderer): Ditto.
+ * svg/SVGFELightElement.cpp:
+ (WebCore::SVGFELightElement::svgAttributeChanged): Ditto.
+ (WebCore::SVGFELightElement::childrenChanged): Ditto.
+ * svg/SVGFEMergeNodeElement.cpp:
+ (WebCore::SVGFEMergeNodeElement::svgAttributeChanged): Ditto.
+ * svg/SVGLength.cpp:
+ (WebCore::SVGLength::determineViewport): Ditto.
+ * svg/SVGStyledElement.cpp:
+ (WebCore::SVGStyledElement::updateRelativeLengthsInformation): Ditto.
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::removeDisallowedElementsFromSubtree): Ditto.
+ * svg/animation/SVGSMILElement.cpp:
+ (WebCore::SVGSMILElement::insertedIntoDocument): Ditto.
+ * xml/XPathNodeSet.cpp:
+ (WebCore::XPath::NodeSet::sort): Ditto.
+ * xml/XPathStep.cpp:
+ (WebCore::XPath::Step::nodesInAxis): Ditto.
+ * xml/XSLTProcessorLibxslt.cpp:
+ (WebCore::xsltStylesheetPointer): Ditto.
+
2010-11-17 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebCore/accessibility/AccessibilityObject.cpp b/WebCore/accessibility/AccessibilityObject.cpp
index 3ddcdc5..caf12dc 100644
--- a/WebCore/accessibility/AccessibilityObject.cpp
+++ b/WebCore/accessibility/AccessibilityObject.cpp
@@ -401,7 +401,7 @@ static bool replacedNodeNeedsCharacter(Node* replacedNode)
// Finds a RenderListItem parent give a node.
static RenderListItem* renderListItemContainerForNode(Node* node)
{
- for (; node; node = node->parent()) {
+ for (; node; node = node->parentNode()) {
RenderBoxModelObject* renderer = node->renderBoxModelObject();
if (renderer && renderer->isListItem())
return toRenderListItem(renderer);
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index ef42272..141d725 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -863,7 +863,7 @@ Element* AccessibilityRenderObject::mouseButtonListener() const
// check if our parent is a mouse button listener
while (node && !node->isElementNode())
- node = node->parent();
+ node = node->parentNode();
if (!node)
return 0;
@@ -895,7 +895,7 @@ void AccessibilityRenderObject::decrement()
static Element* siblingWithAriaRole(String role, Node* node)
{
- Node* sibling = node->parent()->firstChild();
+ Node* sibling = node->parentNode()->firstChild();
while (sibling) {
if (sibling->isElementNode()) {
const AtomicString& siblingAriaRole = static_cast<Element*>(sibling)->getAttribute(roleAttr);
@@ -2332,7 +2332,7 @@ void AccessibilityRenderObject::getDocumentLinks(AccessibilityChildrenVector& re
if (!axobj->accessibilityIsIgnored() && axobj->isLink())
result.append(axobj);
} else {
- Node* parent = curr->parent();
+ Node* parent = curr->parentNode();
if (parent && curr->hasTagName(areaTag) && parent->hasTagName(mapTag)) {
AccessibilityImageMapLink* areaObject = static_cast<AccessibilityImageMapLink*>(axObjectCache()->getOrCreate(ImageMapLinkRole));
areaObject->setHTMLAreaElement(static_cast<HTMLAreaElement*>(curr));
@@ -2700,7 +2700,7 @@ AccessibilityObject* AccessibilityRenderObject::accessibilityImageMapHitTest(HTM
if (!area)
return 0;
- HTMLMapElement* map = static_cast<HTMLMapElement*>(area->parent());
+ HTMLMapElement* map = static_cast<HTMLMapElement*>(area->parentNode());
AccessibilityObject* parent = accessibilityParentForImageMap(map);
if (!parent)
return 0;
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index 7a13f11..9760382 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -407,7 +407,7 @@ static int blockquoteLevel(RenderObject* renderer)
return 0;
int result = 0;
- for (Node* node = renderer->node(); node; node = node->parent()) {
+ for (Node* node = renderer->node(); node; node = node->parentNode()) {
if (node->hasTagName(blockquoteTag))
result += 1;
}
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index 84a0cef..b26882b 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -267,8 +267,8 @@ public:
if (!root)
return;
} else {
- while (root->parent())
- root = root->parent();
+ while (root->parentNode())
+ root = root->parentNode();
// If the node is alone in its DOM tree (doesn't have a parent or any
// children) then the group will be filtered out later anyway.
diff --git a/WebCore/dom/ContainerNode.cpp b/WebCore/dom/ContainerNode.cpp
index 2120e38..e158828 100644
--- a/WebCore/dom/ContainerNode.cpp
+++ b/WebCore/dom/ContainerNode.cpp
@@ -101,7 +101,7 @@ bool ContainerNode::insertBefore(PassRefPtr<Node> newChild, Node* refChild, Exce
{
// Check that this node is not "floating".
// If it is, it can be deleted as a side effect of sending mutation events.
- ASSERT(refCount() || parent());
+ ASSERT(refCount() || parentNode());
ec = 0;
@@ -165,7 +165,7 @@ bool ContainerNode::insertBefore(PassRefPtr<Node> newChild, Node* refChild, Exce
notifyChildInserted(child);
// Add child to the rendering tree.
- if (attached() && !child->attached() && child->parent() == this) {
+ if (attached() && !child->attached() && child->parentNode() == this) {
if (shouldLazyAttach)
child->lazyAttach();
else
@@ -184,7 +184,7 @@ bool ContainerNode::insertBefore(PassRefPtr<Node> newChild, Node* refChild, Exce
void ContainerNode::insertBeforeCommon(Node* nextChild, Node* newChild)
{
ASSERT(newChild);
- ASSERT(!newChild->parent()); // Use insertBefore if you need to handle reparenting (and want DOM mutation events).
+ ASSERT(!newChild->parentNode()); // Use insertBefore if you need to handle reparenting (and want DOM mutation events).
ASSERT(!newChild->nextSibling());
ASSERT(!newChild->previousSibling());
@@ -240,7 +240,7 @@ bool ContainerNode::replaceChild(PassRefPtr<Node> newChild, Node* oldChild, Exce
{
// Check that this node is not "floating".
// If it is, it can be deleted as a side effect of sending mutation events.
- ASSERT(refCount() || parent());
+ ASSERT(refCount() || parentNode());
ec = 0;
@@ -334,7 +334,7 @@ bool ContainerNode::replaceChild(PassRefPtr<Node> newChild, Node* oldChild, Exce
notifyChildInserted(child.get());
// Add child to the rendering tree
- if (attached() && !child->attached() && child->parent() == this) {
+ if (attached() && !child->attached() && child->parentNode() == this) {
if (shouldLazyAttach)
child->lazyAttach();
else
@@ -391,7 +391,7 @@ bool ContainerNode::removeChild(Node* oldChild, ExceptionCode& ec)
{
// Check that this node is not "floating".
// If it is, it can be deleted as a side effect of sending mutation events.
- ASSERT(refCount() || parent());
+ ASSERT(refCount() || parentNode());
ec = 0;
@@ -550,7 +550,7 @@ bool ContainerNode::appendChild(PassRefPtr<Node> newChild, ExceptionCode& ec, bo
{
// Check that this node is not "floating".
// If it is, it can be deleted as a side effect of sending mutation events.
- ASSERT(refCount() || parent());
+ ASSERT(refCount() || parentNode());
ec = 0;
@@ -604,7 +604,7 @@ bool ContainerNode::appendChild(PassRefPtr<Node> newChild, ExceptionCode& ec, bo
notifyChildInserted(child);
// Add child to the rendering tree
- if (attached() && !child->attached() && child->parent() == this) {
+ if (attached() && !child->attached() && child->parentNode() == this) {
if (shouldLazyAttach)
child->lazyAttach();
else
@@ -624,7 +624,7 @@ bool ContainerNode::appendChild(PassRefPtr<Node> newChild, ExceptionCode& ec, bo
void ContainerNode::parserAddChild(PassRefPtr<Node> newChild)
{
ASSERT(newChild);
- ASSERT(!newChild->parent()); // Use appendChild if you need to handle reparenting (and want DOM mutation events).
+ ASSERT(!newChild->parentNode()); // Use appendChild if you need to handle reparenting (and want DOM mutation events).
#if ENABLE(INSPECTOR)
InspectorInstrumentation::willInsertDOMNode(document(), newChild.get(), this);
diff --git a/WebCore/dom/DocumentType.cpp b/WebCore/dom/DocumentType.cpp
index 9012b68..ed4b96c 100644
--- a/WebCore/dom/DocumentType.cpp
+++ b/WebCore/dom/DocumentType.cpp
@@ -59,9 +59,9 @@ PassRefPtr<Node> DocumentType::cloneNode(bool /*deep*/)
void DocumentType::insertedIntoDocument()
{
// Our document node can be null if we were created by a DOMImplementation. We use the parent() instead.
- ASSERT(parent() && parent()->isDocumentNode());
- if (parent() && parent()->isDocumentNode()) {
- Document* doc = static_cast<Document*>(parent());
+ ASSERT(parentNode() && parentNode()->isDocumentNode());
+ if (parentNode() && parentNode()->isDocumentNode()) {
+ Document* doc = static_cast<Document*>(parentNode());
if (!doc->doctype())
doc->setDocType(this);
}
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index f635300..2137f8d 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -1507,7 +1507,7 @@ AtomicString Element::computeInheritedLanguage() const
value = static_cast<const Document*>(n)->contentLanguage();
}
- n = n->parent();
+ n = n->parentNode();
}
return value;
diff --git a/WebCore/dom/MouseRelatedEvent.cpp b/WebCore/dom/MouseRelatedEvent.cpp
index 61c35e8..072656e 100644
--- a/WebCore/dom/MouseRelatedEvent.cpp
+++ b/WebCore/dom/MouseRelatedEvent.cpp
@@ -168,7 +168,7 @@ void MouseRelatedEvent::receivedTarget()
// we should test and fix this.
Node* n = targ;
while (n && !n->renderer())
- n = n->parent();
+ n = n->parentNode();
if (n) {
RenderLayer* layer = n->renderer()->enclosingLayer();
layer->updateLayerPosition();
diff --git a/WebCore/dom/Position.cpp b/WebCore/dom/Position.cpp
index 8c03224..d56613e 100644
--- a/WebCore/dom/Position.cpp
+++ b/WebCore/dom/Position.cpp
@@ -751,13 +751,13 @@ bool Position::isCandidate() const
return false;
if (renderer->isBR())
- return m_offset == 0 && !nodeIsUserSelectNone(node()->parent());
+ return !m_offset && !nodeIsUserSelectNone(node()->parentNode());
if (renderer->isText())
return !nodeIsUserSelectNone(node()) && inRenderedText();
if (isTableElement(node()) || editingIgnoresContent(node()))
- return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(node()->parent());
+ return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(node()->parentNode());
if (m_anchorNode->hasTagName(htmlTag))
return false;
diff --git a/WebCore/dom/PositionIterator.cpp b/WebCore/dom/PositionIterator.cpp
index d2c3a3f..767e705 100644
--- a/WebCore/dom/PositionIterator.cpp
+++ b/WebCore/dom/PositionIterator.cpp
@@ -147,13 +147,13 @@ bool PositionIterator::isCandidate() const
return false;
if (renderer->isBR())
- return !m_offsetInAnchor && !Position::nodeIsUserSelectNone(m_anchorNode->parent());
+ return !m_offsetInAnchor && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode());
if (renderer->isText())
return !Position::nodeIsUserSelectNone(m_anchorNode) && Position(*this).inRenderedText();
if (isTableElement(m_anchorNode) || editingIgnoresContent(m_anchorNode))
- return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parent());
+ return (atStartOfNode() || atEndOfNode()) && !Position::nodeIsUserSelectNone(m_anchorNode->parentNode());
if (!m_anchorNode->hasTagName(htmlTag) && renderer->isBlockFlow()) {
if (toRenderBlock(renderer)->height() || m_anchorNode->hasTagName(bodyTag)) {
diff --git a/WebCore/editing/AppendNodeCommand.cpp b/WebCore/editing/AppendNodeCommand.cpp
index eeecdd2..58f7fa6 100644
--- a/WebCore/editing/AppendNodeCommand.cpp
+++ b/WebCore/editing/AppendNodeCommand.cpp
@@ -38,7 +38,7 @@ AppendNodeCommand::AppendNodeCommand(PassRefPtr<Element> parent, PassRefPtr<Node
{
ASSERT(m_parent);
ASSERT(m_node);
- ASSERT(!m_node->parent());
+ ASSERT(!m_node->parentNode());
ASSERT(m_parent->isContentEditable() || !m_parent->attached());
}
diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index 4e1c733..c4aaac8 100644
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -744,9 +744,9 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(CSSMutableStyleDeclaration
static Node* dummySpanAncestorForNode(const Node* node)
{
while (node && !isStyleSpan(node))
- node = node->parent();
+ node = node->parentNode();
- return node ? node->parent() : 0;
+ return node ? node->parentNode() : 0;
}
void ApplyStyleCommand::cleanupUnstyledAppleStyleSpans(Node* dummySpanAncestor)
@@ -778,7 +778,7 @@ HTMLElement* ApplyStyleCommand::splitAncestorsWithUnicodeBidi(Node* node, bool b
Node* highestAncestorWithUnicodeBidi = 0;
Node* nextHighestAncestorWithUnicodeBidi = 0;
int highestAncestorUnicodeBidi = 0;
- for (Node* n = node->parent(); n != block; n = n->parent()) {
+ for (Node* n = node->parentNode(); n != block; n = n->parentNode()) {
int unicodeBidi = getIdentifierValue(computedStyle(n).get(), CSSPropertyUnicodeBidi);
if (unicodeBidi && unicodeBidi != CSSValueNormal) {
highestAncestorUnicodeBidi = unicodeBidi;
@@ -805,12 +805,12 @@ HTMLElement* ApplyStyleCommand::splitAncestorsWithUnicodeBidi(Node* node, bool b
// Split every ancestor through highest ancestor with embedding.
Node* n = node;
while (true) {
- Element* parent = static_cast<Element*>(n->parent());
+ Element* parent = static_cast<Element*>(n->parentNode());
if (before ? n->previousSibling() : n->nextSibling())
splitElement(parent, before ? n : n->nextSibling());
if (parent == highestAncestorWithUnicodeBidi)
break;
- n = n->parent();
+ n = n->parentNode();
}
return unsplitAncestor;
}
@@ -822,8 +822,8 @@ void ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsp
return;
Node* parent = 0;
- for (Node* n = node->parent(); n != block && n != unsplitAncestor; n = parent) {
- parent = n->parent();
+ for (Node* n = node->parentNode(); n != block && n != unsplitAncestor; n = parent) {
+ parent = n->parentNode();
if (!n->isStyledElement())
continue;
@@ -854,7 +854,7 @@ void ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsp
static Node* highestEmbeddingAncestor(Node* startNode, Node* enclosingNode)
{
- for (Node* n = startNode; n && n != enclosingNode; n = n->parent()) {
+ for (Node* n = startNode; n && n != enclosingNode; n = n->parentNode()) {
if (n->isHTMLElement() && getIdentifierValue(computedStyle(n).get(), CSSPropertyUnicodeBidi) == CSSValueEmbed)
return n;
}
@@ -1620,11 +1620,11 @@ void ApplyStyleCommand::splitTextElementAtEnd(const Position& start, const Posit
Text* text = static_cast<Text*>(end.node());
splitTextNodeContainingElement(text, end.deprecatedEditingOffset());
- Node* prevNode = text->parent()->previousSibling()->lastChild();
+ Node* prevNode = text->parentNode()->previousSibling()->lastChild();
ASSERT(prevNode);
Node* startNode = start.node() == end.node() ? prevNode : start.node();
ASSERT(startNode);
- updateStartEnd(Position(startNode, start.deprecatedEditingOffset()), Position(prevNode->parent(), prevNode->nodeIndex() + 1));
+ updateStartEnd(Position(startNode, start.deprecatedEditingOffset()), Position(prevNode->parentNode(), prevNode->nodeIndex() + 1));
}
bool ApplyStyleCommand::shouldSplitTextElement(Element* element, CSSMutableStyleDeclaration* style)
@@ -1693,7 +1693,7 @@ bool ApplyStyleCommand::mergeStartWithPreviousIfIdentical(const Position &start,
if (start.node()->previousSibling())
return false;
- startNode = start.node()->parent();
+ startNode = start.node()->parentNode();
startOffset = 0;
}
@@ -1730,11 +1730,11 @@ bool ApplyStyleCommand::mergeEndWithNextIfIdentical(const Position &start, const
if (endOffset < caretMaxOffset(endNode))
return false;
- unsigned parentLastOffset = end.node()->parent()->childNodes()->length() - 1;
+ unsigned parentLastOffset = end.node()->parentNode()->childNodes()->length() - 1;
if (end.node()->nextSibling())
return false;
- endNode = end.node()->parent();
+ endNode = end.node()->parentNode();
endOffset = parentLastOffset;
}
diff --git a/WebCore/editing/CompositeEditCommand.cpp b/WebCore/editing/CompositeEditCommand.cpp
index 5579b25..06cfd2b 100644
--- a/WebCore/editing/CompositeEditCommand.cpp
+++ b/WebCore/editing/CompositeEditCommand.cpp
@@ -1185,17 +1185,17 @@ PassRefPtr<Node> CompositeEditCommand::splitTreeToNode(Node* start, Node* end, b
ASSERT(start != end);
RefPtr<Node> node;
- for (node = start; node && node->parent() != end; node = node->parent()) {
- if (!node->parent()->isElementNode())
+ for (node = start; node && node->parentNode() != end; node = node->parentNode()) {
+ if (!node->parentNode()->isElementNode())
break;
- VisiblePosition positionInParent(Position(node->parent(), 0), DOWNSTREAM);
+ VisiblePosition positionInParent(Position(node->parentNode(), 0), DOWNSTREAM);
VisiblePosition positionInNode(Position(node, 0), DOWNSTREAM);
if (positionInParent != positionInNode)
- applyCommandToComposite(SplitElementCommand::create(static_cast<Element*>(node->parent()), node));
+ applyCommandToComposite(SplitElementCommand::create(static_cast<Element*>(node->parentNode()), node));
}
if (splitAncestor) {
splitElement(static_cast<Element*>(end), node);
- return node->parent();
+ return node->parentNode();
}
return node.release();
}
diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp
index 56deac3..b617a27 100644
--- a/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/WebCore/editing/DeleteSelectionCommand.cpp
@@ -314,7 +314,7 @@ static void updatePositionForNodeRemoval(Node* node, Position& position)
{
if (position.isNull())
return;
- if (node->parent() == position.node() && node->nodeIndex() < (unsigned)position.deprecatedEditingOffset())
+ if (node->parentNode() == position.node() && node->nodeIndex() < (unsigned)position.deprecatedEditingOffset())
position = Position(position.node(), position.deprecatedEditingOffset() - 1);
if (position.node() == node || position.node()->isDescendantOf(node))
position = positionInParentBeforeNode(node);
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index c670e87..530ed36 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -635,7 +635,7 @@ WritingDirection Editor::textDirectionForSelection(bool& hasNestedOrMultipleEmbe
Node* block = enclosingBlock(node);
WritingDirection foundDirection = NaturalWritingDirection;
- for (; node != block; node = node->parent()) {
+ for (; node != block; node = node->parentNode()) {
if (!node->isStyledElement())
continue;
diff --git a/WebCore/editing/MergeIdenticalElementsCommand.cpp b/WebCore/editing/MergeIdenticalElementsCommand.cpp
index a1cb79f..ff59f49 100644
--- a/WebCore/editing/MergeIdenticalElementsCommand.cpp
+++ b/WebCore/editing/MergeIdenticalElementsCommand.cpp
@@ -67,7 +67,7 @@ void MergeIdenticalElementsCommand::doUnapply()
RefPtr<Node> atChild = m_atChild.release();
- ContainerNode* parent = m_element2->parent();
+ ContainerNode* parent = m_element2->parentNode();
if (!parent || !parent->isContentEditable())
return;
diff --git a/WebCore/editing/htmlediting.cpp b/WebCore/editing/htmlediting.cpp
index f8f02b9..d08ac2e 100644
--- a/WebCore/editing/htmlediting.cpp
+++ b/WebCore/editing/htmlediting.cpp
@@ -843,7 +843,7 @@ bool isEmptyTableCell(const Node* node)
// Find rendered node
while (node && !node->renderer())
- node = node->parent();
+ node = node->parentNode();
if (!node)
return false;
diff --git a/WebCore/editing/markup.cpp b/WebCore/editing/markup.cpp
index 417de71..4cbdcce 100644
--- a/WebCore/editing/markup.cpp
+++ b/WebCore/editing/markup.cpp
@@ -374,7 +374,7 @@ Node* StyledMarkupAccumulator::serializeNodes(Node* startNode, Node* pastEnd)
ContainerNode* nextParent = next ? next->parentNode() : 0;
if (next != pastEnd && n != nextParent) {
Node* lastAncestorClosedOrSelf = n->isDescendantOf(lastClosed) ? lastClosed : n;
- for (ContainerNode* parent = lastAncestorClosedOrSelf->parent(); parent && parent != nextParent; parent = parent->parentNode()) {
+ for (ContainerNode* parent = lastAncestorClosedOrSelf->parentNode(); parent && parent != nextParent; parent = parent->parentNode()) {
// All ancestors that aren't in the ancestorsToClose list should either be a) unrendered:
if (!parent->renderer())
continue;
diff --git a/WebCore/editing/visible_units.cpp b/WebCore/editing/visible_units.cpp
index d6e1a6e..7d46374 100644
--- a/WebCore/editing/visible_units.cpp
+++ b/WebCore/editing/visible_units.cpp
@@ -610,7 +610,7 @@ VisiblePosition previousLinePosition(const VisiblePosition &visiblePosition, int
RenderObject* renderer = root->closestLeafChildForLogicalLeftPosition(x - absPos.x(), isEditablePosition(p))->renderer();
Node* node = renderer->node();
if (node && editingIgnoresContent(node))
- return Position(node->parent(), node->nodeIndex());
+ return Position(node->parentNode(), node->nodeIndex());
return renderer->positionForPoint(IntPoint(x - absPos.x(), root->lineTop()));
}
@@ -715,7 +715,7 @@ VisiblePosition nextLinePosition(const VisiblePosition &visiblePosition, int x)
RenderObject* renderer = root->closestLeafChildForLogicalLeftPosition(x - absPos.x(), isEditablePosition(p))->renderer();
Node* node = renderer->node();
if (node && editingIgnoresContent(node))
- return Position(node->parent(), node->nodeIndex());
+ return Position(node->parentNode(), node->nodeIndex());
return renderer->positionForPoint(IntPoint(x - absPos.x(), root->lineTop()));
}
diff --git a/WebCore/html/HTMLAreaElement.cpp b/WebCore/html/HTMLAreaElement.cpp
index 0155bce..cebfda2 100644
--- a/WebCore/html/HTMLAreaElement.cpp
+++ b/WebCore/html/HTMLAreaElement.cpp
@@ -165,7 +165,7 @@ Path HTMLAreaElement::getRegion(const IntSize& size) const
HTMLImageElement* HTMLAreaElement::imageElement() const
{
- Node* mapElement = parent();
+ Node* mapElement = parentNode();
if (!mapElement->hasTagName(mapTag))
return 0;
diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index bc4bf07..4dcf998 100644
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -359,7 +359,7 @@ void HTMLElement::setInnerHTML(const String& html, ExceptionCode& ec)
void HTMLElement::setOuterHTML(const String& html, ExceptionCode& ec)
{
- Node* p = parent();
+ Node* p = parentNode();
if (!p || !p->isHTMLElement()) {
ec = NO_MODIFICATION_ALLOWED_ERR;
return;
@@ -507,7 +507,7 @@ Node* HTMLElement::insertAdjacent(const String& where, Node* newChild, Exception
// Opera also appears to disallow such usage.
if (equalIgnoringCase(where, "beforeBegin")) {
- ContainerNode* parent = this->parent();
+ ContainerNode* parent = this->parentNode();
return (parent && parent->insertBefore(newChild, this, ec)) ? newChild : 0;
}
@@ -518,7 +518,7 @@ Node* HTMLElement::insertAdjacent(const String& where, Node* newChild, Exception
return appendChild(newChild, ec) ? newChild : 0;
if (equalIgnoringCase(where, "afterEnd")) {
- ContainerNode* parent = this->parent();
+ ContainerNode* parent = this->parentNode();
return (parent && parent->insertBefore(newChild, nextSibling(), ec)) ? newChild : 0;
}
@@ -625,7 +625,7 @@ void HTMLElement::addHTMLAlignmentToStyledElement(StyledElement* element, Attrib
bool HTMLElement::supportsFocus() const
{
- return Element::supportsFocus() || (isContentEditable() && parent() && !parent()->isContentEditable());
+ return Element::supportsFocus() || (isContentEditable() && parentNode() && !parentNode()->isContentEditable());
}
bool HTMLElement::isContentEditable() const
diff --git a/WebCore/html/HTMLEmbedElement.cpp b/WebCore/html/HTMLEmbedElement.cpp
index c4f007c..df97280 100644
--- a/WebCore/html/HTMLEmbedElement.cpp
+++ b/WebCore/html/HTMLEmbedElement.cpp
@@ -220,9 +220,9 @@ void HTMLEmbedElement::insertedIntoDocument()
String width = getAttribute(widthAttr);
String height = getAttribute(heightAttr);
if (!width.isEmpty() || !height.isEmpty()) {
- Node* n = parent();
+ Node* n = parentNode();
while (n && !n->hasTagName(objectTag))
- n = n->parent();
+ n = n->parentNode();
if (n) {
if (!width.isEmpty())
static_cast<HTMLObjectElement*>(n)->setAttribute(widthAttr, width);
@@ -247,9 +247,9 @@ void HTMLEmbedElement::attributeChanged(Attribute* attr, bool preserveDecls)
HTMLPlugInImageElement::attributeChanged(attr, preserveDecls);
if ((attr->name() == widthAttr || attr->name() == heightAttr) && !attr->isEmpty()) {
- Node* n = parent();
+ ContainerNode* n = parentNode();
while (n && !n->hasTagName(objectTag))
- n = n->parent();
+ n = n->parentNode();
if (n)
static_cast<HTMLObjectElement*>(n)->setAttribute(attr->name(), attr->value());
}
diff --git a/WebCore/html/HTMLTableElement.cpp b/WebCore/html/HTMLTableElement.cpp
index f6344d4..e554620 100644
--- a/WebCore/html/HTMLTableElement.cpp
+++ b/WebCore/html/HTMLTableElement.cpp
@@ -205,7 +205,7 @@ PassRefPtr<HTMLElement> HTMLTableElement::insertRow(int index, ExceptionCode& ec
ContainerNode* parent;
if (lastRow)
- parent = row ? row->parent() : lastRow->parent();
+ parent = row ? row->parentNode() : lastRow->parentNode();
else {
parent = lastBody();
if (!parent) {
diff --git a/WebCore/html/HTMLTableRowsCollection.cpp b/WebCore/html/HTMLTableRowsCollection.cpp
index b38c271..20143d9 100644
--- a/WebCore/html/HTMLTableRowsCollection.cpp
+++ b/WebCore/html/HTMLTableRowsCollection.cpp
@@ -39,17 +39,17 @@ using namespace HTMLNames;
static bool isInHead(Element* row)
{
- return row->parent() && static_cast<Element*>(row->parent())->hasLocalName(theadTag);
+ return row->parentNode() && static_cast<Element*>(row->parentNode())->hasLocalName(theadTag);
}
static bool isInBody(Element* row)
{
- return row->parent() && static_cast<Element*>(row->parent())->hasLocalName(tbodyTag);
+ return row->parentNode() && static_cast<Element*>(row->parentNode())->hasLocalName(tbodyTag);
}
static bool isInFoot(Element* row)
{
- return row->parent() && static_cast<Element*>(row->parent())->hasLocalName(tfootTag);
+ return row->parentNode() && static_cast<Element*>(row->parentNode())->hasLocalName(tfootTag);
}
HTMLTableRowElement* HTMLTableRowsCollection::rowAfter(HTMLTableElement* table, HTMLTableRowElement* previous)
@@ -58,7 +58,7 @@ HTMLTableRowElement* HTMLTableRowsCollection::rowAfter(HTMLTableElement* table,
// Start by looking for the next row in this section.
// Continue only if there is none.
- if (previous && previous->parent() != table) {
+ if (previous && previous->parentNode() != table) {
for (child = previous->nextSibling(); child; child = child->nextSibling()) {
if (child->hasTagName(trTag))
return static_cast<HTMLTableRowElement*>(child);
@@ -69,7 +69,7 @@ HTMLTableRowElement* HTMLTableRowsCollection::rowAfter(HTMLTableElement* table,
if (!previous)
child = table->firstChild();
else if (isInHead(previous))
- child = previous->parent()->nextSibling();
+ child = previous->parentNode()->nextSibling();
for (; child; child = child->nextSibling()) {
if (child->hasTagName(theadTag)) {
for (Node* grandchild = child->firstChild(); grandchild; grandchild = grandchild->nextSibling()) {
@@ -82,10 +82,10 @@ HTMLTableRowElement* HTMLTableRowsCollection::rowAfter(HTMLTableElement* table,
// If still looking at top level and bodies, find the next row in top level or the first in the next body section.
if (!previous || isInHead(previous))
child = table->firstChild();
- else if (previous->parent() == table)
+ else if (previous->parentNode() == table)
child = previous->nextSibling();
else if (isInBody(previous))
- child = previous->parent()->nextSibling();
+ child = previous->parentNode()->nextSibling();
for (; child; child = child->nextSibling()) {
if (child->hasTagName(trTag))
return static_cast<HTMLTableRowElement*>(child);
@@ -101,7 +101,7 @@ HTMLTableRowElement* HTMLTableRowsCollection::rowAfter(HTMLTableElement* table,
if (!previous || !isInFoot(previous))
child = table->firstChild();
else
- child = previous->parent()->nextSibling();
+ child = previous->parentNode()->nextSibling();
for (; child; child = child->nextSibling()) {
if (child->hasTagName(tfootTag)) {
for (Node* grandchild = child->firstChild(); grandchild; grandchild = grandchild->nextSibling()) {
diff --git a/WebCore/html/HTMLViewSourceDocument.cpp b/WebCore/html/HTMLViewSourceDocument.cpp
index f7217eb..27eaf51 100644
--- a/WebCore/html/HTMLViewSourceDocument.cpp
+++ b/WebCore/html/HTMLViewSourceDocument.cpp
@@ -277,7 +277,7 @@ int HTMLViewSourceDocument::addRange(const String& source, int start, int end, c
}
addText(text, className);
if (!className.isEmpty() && m_current != m_tbody)
- m_current = static_cast<Element*>(m_current->parent());
+ m_current = static_cast<Element*>(m_current->parentNode());
return end;
}
diff --git a/WebCore/html/MediaDocument.cpp b/WebCore/html/MediaDocument.cpp
index c4f0b14..af66795 100644
--- a/WebCore/html/MediaDocument.cpp
+++ b/WebCore/html/MediaDocument.cpp
@@ -211,7 +211,7 @@ void MediaDocument::replaceMediaElementTimerFired(Timer<MediaDocument>*)
embedElement->setAttribute(typeAttr, frame()->loader()->writer()->mimeType());
ExceptionCode ec;
- videoElement->parent()->replaceChild(embedElement, videoElement, ec);
+ videoElement->parentNode()->replaceChild(embedElement, videoElement, ec);
}
}
diff --git a/WebCore/html/parser/HTMLConstructionSite.cpp b/WebCore/html/parser/HTMLConstructionSite.cpp
index 7201ac7..c46b9b9 100644
--- a/WebCore/html/parser/HTMLConstructionSite.cpp
+++ b/WebCore/html/parser/HTMLConstructionSite.cpp
@@ -91,7 +91,7 @@ PassRefPtr<ChildType> HTMLConstructionSite::attach(ContainerNode* parent, PassRe
// doesn't. It feels like we're missing a concept somehow.
if (shouldFosterParent()) {
fosterParent(child.get());
- ASSERT(child->attached() || !child->parent() || !child->parent()->attached());
+ ASSERT(child->attached() || !child->parentNode() || !child->parentNode()->attached());
return child.release();
}
@@ -434,7 +434,7 @@ void HTMLConstructionSite::findFosterSite(AttachmentSite& site)
HTMLElementStack::ElementRecord* lastTableElementRecord = m_openElements.topmost(tableTag.localName());
if (lastTableElementRecord) {
Element* lastTableElement = lastTableElementRecord->element();
- if (ContainerNode* parent = lastTableElement->parent()) {
+ if (ContainerNode* parent = lastTableElement->parentNode()) {
site.parent = parent;
site.nextChild = lastTableElement;
return;
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index 3e15a26..3d39131 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -230,7 +230,7 @@ HTMLFormElement* closestFormAncestor(Element* element)
while (element) {
if (element->hasTagName(formTag))
return static_cast<HTMLFormElement*>(element);
- Node* parent = element->parent();
+ ContainerNode* parent = element->parentNode();
if (!parent || !parent->isElementNode())
return 0;
element = static_cast<Element*>(parent);
diff --git a/WebCore/page/FocusController.cpp b/WebCore/page/FocusController.cpp
index 8ee5dff..2866019 100644
--- a/WebCore/page/FocusController.cpp
+++ b/WebCore/page/FocusController.cpp
@@ -464,25 +464,25 @@ void FocusController::findFocusableNodeInDirection(Node* outer, Node* focusedNod
candidate.enclosingScrollableBox = candidateParent.node;
} else if (!isInRootDocument(outer)) {
- if (Document* document = static_cast<Document*>(outer->parent()))
+ if (Document* document = static_cast<Document*>(outer->parentNode()))
candidate.enclosingScrollableBox = static_cast<Node*>(document->ownerElement());
- } else if (isScrollableContainerNode(outer->parent()))
- candidate.enclosingScrollableBox = outer->parent();
+ } else if (isScrollableContainerNode(outer->parentNode()))
+ candidate.enclosingScrollableBox = outer->parentNode();
// Get distance and alignment from current candidate.
distanceDataForNode(direction, focusedNode, candidate);
// Bail out if distance is maximum.
if (candidate.distance == maxDistance()) {
- node = node->traverseNextNode(outer->parent());
+ node = node->traverseNextNode(outer->parentNode());
continue;
}
updateFocusCandidateIfCloser(focusedNode, candidate, closest);
}
- node = node->traverseNextNode(outer->parent());
+ node = node->traverseNextNode(outer->parentNode());
}
}
diff --git a/WebCore/rendering/MediaControlElements.cpp b/WebCore/rendering/MediaControlElements.cpp
index adaac03..1af1b80 100644
--- a/WebCore/rendering/MediaControlElements.cpp
+++ b/WebCore/rendering/MediaControlElements.cpp
@@ -166,7 +166,7 @@ bool MediaControlElement::rendererIsNeeded(RenderStyle* style)
{
ASSERT(document()->page());
- return HTMLDivElement::rendererIsNeeded(style) && parent() && parent()->renderer()
+ return HTMLDivElement::rendererIsNeeded(style) && parentNode() && parentNode()->renderer()
&& (!style->hasAppearance() || document()->page()->theme()->shouldRenderMediaControlPart(style->appearance(), m_mediaElement));
}
@@ -183,12 +183,12 @@ void MediaControlElement::attach()
return;
renderer->setStyle(style.get());
setRenderer(renderer);
- if (parent() && parent()->renderer()) {
+ if (parentNode() && parentNode()->renderer()) {
// Find next sibling with a renderer to determine where to insert.
Node* sibling = nextSibling();
while (sibling && !sibling->renderer())
sibling = sibling->nextSibling();
- parent()->renderer()->addChild(renderer, sibling ? sibling->renderer() : 0);
+ parentNode()->renderer()->addChild(renderer, sibling ? sibling->renderer() : 0);
}
ContainerNode::attach();
}
@@ -202,7 +202,7 @@ void MediaControlElement::updateStyle()
if (!style)
return;
- bool needsRenderer = rendererIsNeeded(style.get()) && parent() && parent()->renderer();
+ bool needsRenderer = rendererIsNeeded(style.get()) && parentNode() && parentNode()->renderer();
if (renderer() && !needsRenderer)
detach();
else if (!renderer() && needsRenderer)
@@ -416,7 +416,7 @@ bool MediaControlInputElement::rendererIsNeeded(RenderStyle* style)
{
ASSERT(document()->page());
- return HTMLInputElement::rendererIsNeeded(style) && parent() && parent()->renderer()
+ return HTMLInputElement::rendererIsNeeded(style) && parentNode() && parentNode()->renderer()
&& (!style->hasAppearance() || document()->page()->theme()->shouldRenderMediaControlPart(style->appearance(), mediaElement()));
}
@@ -434,12 +434,12 @@ void MediaControlInputElement::attach()
return;
renderer->setStyle(style.get());
setRenderer(renderer);
- if (parent() && parent()->renderer()) {
+ if (parentNode() && parentNode()->renderer()) {
// Find next sibling with a renderer to determine where to insert.
Node* sibling = nextSibling();
while (sibling && !sibling->renderer())
sibling = sibling->nextSibling();
- parent()->renderer()->addChild(renderer, sibling ? sibling->renderer() : 0);
+ parentNode()->renderer()->addChild(renderer, sibling ? sibling->renderer() : 0);
}
ContainerNode::attach();
}
@@ -453,7 +453,7 @@ void MediaControlInputElement::updateStyle()
if (!style)
return;
- bool needsRenderer = rendererIsNeeded(style.get()) && parent() && parent()->renderer();
+ bool needsRenderer = rendererIsNeeded(style.get()) && parentNode() && parentNode()->renderer();
if (renderer() && !needsRenderer)
detach();
else if (!renderer() && needsRenderer)
diff --git a/WebCore/rendering/RenderSVGGradientStop.cpp b/WebCore/rendering/RenderSVGGradientStop.cpp
index a5e5808..094fc7f 100644
--- a/WebCore/rendering/RenderSVGGradientStop.cpp
+++ b/WebCore/rendering/RenderSVGGradientStop.cpp
@@ -72,7 +72,7 @@ void RenderSVGGradientStop::layout()
SVGGradientElement* RenderSVGGradientStop::gradientElement() const
{
- ContainerNode* parentNode = node()->parent();
+ ContainerNode* parentNode = node()->parentNode();
if (parentNode->hasTagName(linearGradientTag) || parentNode->hasTagName(radialGradientTag))
return static_cast<SVGGradientElement*>(parentNode);
return 0;
diff --git a/WebCore/svg/SVGAElement.cpp b/WebCore/svg/SVGAElement.cpp
index 8e429d0..8e0e56e 100644
--- a/WebCore/svg/SVGAElement.cpp
+++ b/WebCore/svg/SVGAElement.cpp
@@ -121,7 +121,7 @@ void SVGAElement::synchronizeProperty(const QualifiedName& attrName)
RenderObject* SVGAElement::createRenderer(RenderArena* arena, RenderStyle*)
{
- if (static_cast<SVGElement*>(parent())->isTextContent())
+ if (static_cast<SVGElement*>(parentNode())->isTextContent())
return new (arena) RenderSVGInline(this);
return new (arena) RenderSVGTransformableContainer(this);
@@ -207,8 +207,8 @@ bool SVGAElement::childShouldCreateRenderer(Node* child) const
// The 'a' element may contain any element that its parent may contain, except itself.
if (child->hasTagName(SVGNames::aTag))
return false;
- if (parent() && parent()->isSVGElement())
- return parent()->childShouldCreateRenderer(child);
+ if (parentNode() && parentNode()->isSVGElement())
+ return parentNode()->childShouldCreateRenderer(child);
return SVGElement::childShouldCreateRenderer(child);
}
diff --git a/WebCore/svg/SVGFELightElement.cpp b/WebCore/svg/SVGFELightElement.cpp
index 315aa29..7fed774 100644
--- a/WebCore/svg/SVGFELightElement.cpp
+++ b/WebCore/svg/SVGFELightElement.cpp
@@ -78,8 +78,8 @@ void SVGFELightElement::svgAttributeChanged(const QualifiedName& attrName)
|| attrName == SVGNames::pointsAtZAttr
|| attrName == SVGNames::specularExponentAttr
|| attrName == SVGNames::limitingConeAngleAttr) {
- if (ContainerNode* parentNode = parent()) {
- RenderObject* renderer = parentNode->renderer();
+ if (ContainerNode* parent = parentNode()) {
+ RenderObject* renderer = parent->renderer();
if (renderer && renderer->isSVGResourceFilterPrimitive())
RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
}
@@ -131,8 +131,8 @@ void SVGFELightElement::childrenChanged(bool changedByParser, Node* beforeChange
SVGElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
if (!changedByParser) {
- if (ContainerNode* parentNode = parent()) {
- RenderObject* renderer = parentNode->renderer();
+ if (ContainerNode* parent = parentNode()) {
+ RenderObject* renderer = parent->renderer();
if (renderer && renderer->isSVGResourceFilterPrimitive())
RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
}
diff --git a/WebCore/svg/SVGFEMergeNodeElement.cpp b/WebCore/svg/SVGFEMergeNodeElement.cpp
index ee1ac3a..54bb2fe 100644
--- a/WebCore/svg/SVGFEMergeNodeElement.cpp
+++ b/WebCore/svg/SVGFEMergeNodeElement.cpp
@@ -55,11 +55,11 @@ void SVGFEMergeNodeElement::svgAttributeChanged(const QualifiedName& attrName)
if (attrName != SVGNames::inAttr)
return;
- ContainerNode* parentNode = parent();
- if (!parentNode)
+ ContainerNode* parent = parentNode();
+ if (!parent)
return;
- RenderObject* renderer = parentNode->renderer();
+ RenderObject* renderer = parent->renderer();
if (!renderer || !renderer->isSVGResourceFilterPrimitive())
return;
diff --git a/WebCore/svg/SVGLength.cpp b/WebCore/svg/SVGLength.cpp
index f8381bf..8168cf6 100644
--- a/WebCore/svg/SVGLength.cpp
+++ b/WebCore/svg/SVGLength.cpp
@@ -347,7 +347,7 @@ bool SVGLength::determineViewport(const SVGElement* context, float& width, float
}
// Resolve value against enclosing non-SVG RenderBox
- if (!context->parent() || context->parent()->isSVGElement())
+ if (!context->parentNode() || context->parentNode()->isSVGElement())
return false;
RenderObject* renderer = context->renderer();
diff --git a/WebCore/svg/SVGStyledElement.cpp b/WebCore/svg/SVGStyledElement.cpp
index 64030bc..d5ef486 100644
--- a/WebCore/svg/SVGStyledElement.cpp
+++ b/WebCore/svg/SVGStyledElement.cpp
@@ -362,14 +362,14 @@ void SVGStyledElement::updateRelativeLengthsInformation(bool hasRelativeLengths,
}
// Find first styled parent node, and notify it that we've changed our relative length state.
- Node* node = parent();
+ ContainerNode* node = parentNode();
while (node) {
if (!node->isSVGElement())
break;
SVGElement* element = static_cast<SVGElement*>(node);
if (!element->isStyled()) {
- node = node->parent();
+ node = node->parentNode();
continue;
}
diff --git a/WebCore/svg/SVGUseElement.cpp b/WebCore/svg/SVGUseElement.cpp
index 3fbc22e..a69334c 100644
--- a/WebCore/svg/SVGUseElement.cpp
+++ b/WebCore/svg/SVGUseElement.cpp
@@ -745,7 +745,7 @@ void SVGUseElement::removeDisallowedElementsFromSubtree(Node* subtree)
if (isDisallowedElement(node)) {
Node* next = node->traverseNextSibling(subtree);
// The subtree is not in document so this won't generate events that could mutate the tree.
- node->parent()->removeChild(node, ec);
+ node->parentNode()->removeChild(node, ec);
node = next;
} else
node = node->traverseNextNode(subtree);
diff --git a/WebCore/svg/animation/SVGSMILElement.cpp b/WebCore/svg/animation/SVGSMILElement.cpp
index 6757fee..441cfc3 100644
--- a/WebCore/svg/animation/SVGSMILElement.cpp
+++ b/WebCore/svg/animation/SVGSMILElement.cpp
@@ -147,7 +147,7 @@ void SVGSMILElement::insertedIntoDocument()
SVGElement::insertedIntoDocument();
#ifndef NDEBUG
// Verify we are not in <use> instance tree.
- for (Node* n = this; n; n = n->parent())
+ for (ContainerNode* n = this; n; n = n->parentNode())
ASSERT(!n->isShadowNode());
#endif
SVGSVGElement* owner = ownerSVGElement();
diff --git a/WebCore/xml/XPathNodeSet.cpp b/WebCore/xml/XPathNodeSet.cpp
index ba9423e..a8e4428 100644
--- a/WebCore/xml/XPathNodeSet.cpp
+++ b/WebCore/xml/XPathNodeSet.cpp
@@ -155,7 +155,7 @@ void NodeSet::sort() const
parentsVector.append(n);
containsAttributeNodes = true;
}
- while ((n = n->parent()))
+ while ((n = n->parentNode()))
parentsVector.append(n);
}
sortBlock(0, nodeCount, parentMatrix, containsAttributeNodes);
diff --git a/WebCore/xml/XPathStep.cpp b/WebCore/xml/XPathStep.cpp
index ddd8c3c..d82cd50 100644
--- a/WebCore/xml/XPathStep.cpp
+++ b/WebCore/xml/XPathStep.cpp
@@ -320,7 +320,7 @@ void Step::nodesInAxis(Node* context, NodeSet& nodes) const
context = static_cast<Attr*>(context)->ownerElement();
Node* n = context;
- while (Node* parent = n->parent()) {
+ while (ContainerNode* parent = n->parentNode()) {
for (n = n->traversePreviousNode(); n != parent; n = n->traversePreviousNode())
if (nodeMatches(n, PrecedingAxis, m_nodeTest))
nodes.append(n);
diff --git a/WebCore/xml/XSLTProcessorLibxslt.cpp b/WebCore/xml/XSLTProcessorLibxslt.cpp
index a307c21..469cb64 100644
--- a/WebCore/xml/XSLTProcessorLibxslt.cpp
+++ b/WebCore/xml/XSLTProcessorLibxslt.cpp
@@ -224,7 +224,7 @@ static void freeXsltParamArray(const char** params)
static xsltStylesheetPtr xsltStylesheetPointer(RefPtr<XSLStyleSheet>& cachedStylesheet, Node* stylesheetRootNode)
{
if (!cachedStylesheet && stylesheetRootNode) {
- cachedStylesheet = XSLStyleSheet::create(stylesheetRootNode->parent() ? stylesheetRootNode->parent() : stylesheetRootNode,
+ cachedStylesheet = XSLStyleSheet::create(stylesheetRootNode->parentNode() ? stylesheetRootNode->parentNode() : stylesheetRootNode,
stylesheetRootNode->document()->url().string(),
stylesheetRootNode->document()->url()); // FIXME: Should we use baseURL here?
cachedStylesheet->parseString(createMarkup(stylesheetRootNode));
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 5df0cd3..31e5df9 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-17 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Converge means of querying a parent node into one way, which is Node::parentNode.
+ https://bugs.webkit.org/show_bug.cgi?id=49686
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::insertStyleText): Changed to use parentNode.
+ (WebKit::WebFrameImpl::setFindEndstateFocusAndSelection): Ditto.
+
2010-11-16 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index c5ac275..adaab61 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -848,7 +848,7 @@ bool WebFrameImpl::insertStyleText(
if (!id.isEmpty()) {
Element* oldElement = document->getElementById(id);
if (oldElement) {
- Node* parent = oldElement->parent();
+ Node* parent = oldElement->parentNode();
if (!parent)
return false;
parent->removeChild(oldElement, err);
@@ -2006,7 +2006,7 @@ void WebFrameImpl::setFindEndstateFocusAndSelection()
// example, focus links if we have found text within the link.
Node* node = m_activeMatch->firstNode();
while (node && !node->isFocusable() && node != frame()->document())
- node = node->parent();
+ node = node->parentNode();
if (node && node != frame()->document()) {
// Found a focusable parent node. Set focus to it.
diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index 8121111..8f40c0f 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -1092,11 +1092,11 @@ void QWebElement::prependOutside(const QWebElement &element)
if (!m_element || element.isNull())
return;
- if (!m_element->parent())
+ if (!m_element->parentNode())
return;
ExceptionCode exception = 0;
- m_element->parent()->insertBefore(element.m_element, m_element, exception);
+ m_element->parentNode()->insertBefore(element.m_element, m_element, exception);
}
/*!
@@ -1111,7 +1111,7 @@ void QWebElement::prependOutside(const QString &markup)
if (!m_element)
return;
- if (!m_element->parent())
+ if (!m_element->parentNode())
return;
if (!m_element->isHTMLElement())
@@ -1121,7 +1121,7 @@ void QWebElement::prependOutside(const QString &markup)
RefPtr<DocumentFragment> fragment = htmlElement->deprecatedCreateContextualFragment(markup);
ExceptionCode exception = 0;
- m_element->parent()->insertBefore(fragment, m_element, exception);
+ m_element->parentNode()->insertBefore(fragment, m_element, exception);
}
/*!
@@ -1139,14 +1139,14 @@ void QWebElement::appendOutside(const QWebElement &element)
if (!m_element || element.isNull())
return;
- if (!m_element->parent())
+ if (!m_element->parentNode())
return;
ExceptionCode exception = 0;
if (!m_element->nextSibling())
- m_element->parent()->appendChild(element.m_element, exception);
+ m_element->parentNode()->appendChild(element.m_element, exception);
else
- m_element->parent()->insertBefore(element.m_element, m_element->nextSibling(), exception);
+ m_element->parentNode()->insertBefore(element.m_element, m_element->nextSibling(), exception);
}
/*!
@@ -1161,7 +1161,7 @@ void QWebElement::appendOutside(const QString &markup)
if (!m_element)
return;
- if (!m_element->parent())
+ if (!m_element->parentNode())
return;
if (!m_element->isHTMLElement())
@@ -1172,9 +1172,9 @@ void QWebElement::appendOutside(const QString &markup)
ExceptionCode exception = 0;
if (!m_element->nextSibling())
- m_element->parent()->appendChild(fragment, exception);
+ m_element->parentNode()->appendChild(fragment, exception);
else
- m_element->parent()->insertBefore(fragment, m_element->nextSibling(), exception);
+ m_element->parentNode()->insertBefore(fragment, m_element->nextSibling(), exception);
}
/*!
@@ -1308,7 +1308,7 @@ void QWebElement::encloseContentsWith(const QString &markup)
if (!m_element)
return;
- if (!m_element->parent())
+ if (!m_element->parentNode())
return;
if (!m_element->isHTMLElement())
@@ -1360,16 +1360,16 @@ void QWebElement::encloseWith(const QWebElement &element)
// wrapping it in the fragment. The reason for doing it in this order is
// that once the fragment has been added to the document it is empty, so
// we no longer have access to the nodes it contained.
- Node* parentNode = m_element->parent();
+ Node* parent = m_element->parentNode();
Node* siblingNode = m_element->nextSibling();
ExceptionCode exception = 0;
insertionPoint->appendChild(m_element, exception);
if (!siblingNode)
- parentNode->appendChild(element.m_element, exception);
+ parent->appendChild(element.m_element, exception);
else
- parentNode->insertBefore(element.m_element, siblingNode, exception);
+ parent->insertBefore(element.m_element, siblingNode, exception);
}
/*!
@@ -1383,7 +1383,7 @@ void QWebElement::encloseWith(const QString &markup)
if (!m_element)
return;
- if (!m_element->parent())
+ if (!m_element->parentNode())
return;
if (!m_element->isHTMLElement())
@@ -1404,16 +1404,16 @@ void QWebElement::encloseWith(const QString &markup)
// wrapping it in the fragment. The reason for doing it in this order is
// that once the fragment has been added to the document it is empty, so
// we no longer have access to the nodes it contained.
- Node* parentNode = m_element->parent();
+ Node* parent = m_element->parentNode();
Node* siblingNode = m_element->nextSibling();
ExceptionCode exception = 0;
insertionPoint->appendChild(m_element, exception);
if (!siblingNode)
- parentNode->appendChild(fragment, exception);
+ parent->appendChild(fragment, exception);
else
- parentNode->insertBefore(fragment, siblingNode, exception);
+ parent->insertBefore(fragment, siblingNode, exception);
}
/*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2f14bb4..04c7125 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-17 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Converge means of querying a parent node into one way, which is Node::parentNode.
+ https://bugs.webkit.org/show_bug.cgi?id=49686
+
+ * Api/qwebelement.cpp:
+ (QWebElement::prependOutside): Changed to use parentNode.
+ (QWebElement::appendOutside): Ditto.
+ (QWebElement::encloseContentsWith): Ditto.
+ (QWebElement::encloseWith): Ditto.
+
2010-11-16 Simon Hausmann <simon.hausmann at nokia.com>
Reviewed by Andreas Kling.
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8268430..ae654f5 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-17 Dimitri Glazkov <dglazkov at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Converge means of querying a parent node into one way, which is Node::parentNode.
+ https://bugs.webkit.org/show_bug.cgi?id=49686
+
+ * WebProcess/WebPage/WebPage.cpp: Changed to use parentNode.
+ (WebKit::WebPage::findZoomableAreaForPoint): Ditto.
+
2010-11-17 Timothy Hatcher <timothy at apple.com>
Remove duplicate Web Inspector message handeling in WebPage::didReceiveMessage.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 05fd924..d9b6b3b 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -1082,7 +1082,7 @@ void WebPage::findZoomableAreaForPoint(const WebCore::IntPoint& point)
Node* node = result.innerNode();
while (node && node->getRect().width() < minimumZoomTargetWidth)
- node = node->parent();
+ node = node->parentNode();
IntRect zoomableArea;
if (node)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list