Changeset 141524 in webkit

Timestamp:

Jan 31, 2013 7:17:19 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Rename from parentOrHost* to parentOrShadowHost* in Node.h.
​https://bugs.webkit.org/show_bug.cgi?id=108308

Source/WebCore:

Patch by Changhun Kang <​temoochin@company100.net> on 2013-01-31
Reviewed by Dimitri Glazkov.

No new tests. No change in behavior.

Source/WebKit2:

Patch by Changhun Kang <​temoochin@company100.net> on 2013-01-31
Reviewed by Dimitri Glazkov.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDOMBinding.h (modified) (1 diff)
• WebCore/bindings/v8/V8GCController.cpp (modified) (1 diff)
• WebCore/css/SelectorFilter.cpp (modified) (4 diffs)
• WebCore/css/StyleResolver.cpp (modified) (2 diffs)
• WebCore/css/StyleScopeResolver.cpp (modified) (2 diffs)
• WebCore/dom/Attr.cpp (modified) (1 diff)
• WebCore/dom/ComposedShadowTreeWalker.cpp (modified) (1 diff)
• WebCore/dom/ContainerNode.cpp (modified) (7 diffs)
• WebCore/dom/ContainerNode.h (modified) (1 diff)
• WebCore/dom/ContainerNodeAlgorithms.h (modified) (2 diffs)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Document.h (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (1 diff)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/dom/ElementRareData.h (modified) (1 diff)
• WebCore/dom/ElementShadow.cpp (modified) (2 diffs)
• WebCore/dom/Node.cpp (modified) (16 diffs)
• WebCore/dom/Node.h (modified) (5 diffs)
• WebCore/dom/PseudoElement.cpp (modified) (2 diffs)
• WebCore/dom/ShadowRoot.h (modified) (1 diff)
• WebCore/dom/Text.cpp (modified) (1 diff)
• WebCore/editing/FrameSelection.cpp (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (6 diffs)
• WebCore/html/HTMLFrameOwnerElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLFrameOwnerElement.h (modified) (1 diff)
• WebCore/html/HTMLStyleElement.cpp (modified) (1 diff)
• WebCore/html/MediaDocument.cpp (modified) (1 diff)
• WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebCore/page/TouchAdjustment.cpp (modified) (4 diffs)
• WebCore/rendering/HitTestResult.cpp (modified) (2 diffs)
• WebCore/rendering/RenderObject.h (modified) (1 diff)
• WebCore/rendering/RenderTreeAsText.cpp (modified) (1 diff)
• WebCore/rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)
• WebCore/svg/SVGElement.cpp (modified) (7 diffs)
• WebCore/svg/SVGElementInstance.h (modified) (1 diff)
• WebCore/svg/SVGForeignObjectElement.cpp (modified) (1 diff)
• WebCore/svg/SVGGElement.cpp (modified) (1 diff)
• WebCore/svg/SVGLocatable.cpp (modified) (3 diffs)
• WebCore/svg/SVGStyledElement.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-31  Changhun Kang  <temoochin@company100.net>
+
+        Rename from parentOrHost* to parentOrShadowHost* in Node.h.
+        https://bugs.webkit.org/show_bug.cgi?id=108308
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests. No change in behavior.
+
 2013-01-31  Alec Flett  <alecflett@chromium.org>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -219 +219 @@
             return node->document();
 
-        while (node->parentOrHostNode())
-            node = node->parentOrHostNode();
+        while (node->parentOrShadowHostNode())
+            node = node->parentOrShadowHostNode();
         return node;
     }

trunk/Source/WebCore/bindings/v8/V8GCController.cpp

@@ -173 +173 @@
     }
 
-    while (Node* parent = node->parentOrHostNode())
+    while (Node* parent = node->parentOrShadowHostNode())
         node = parent;
 

trunk/Source/WebCore/css/SelectorFilter.cpp

@@ -54 +54 @@
 {
     ASSERT(m_ancestorIdentifierFilter);
-    ASSERT(m_parentStack.isEmpty() || m_parentStack.last().element == parent->parentOrHostElement());
-    ASSERT(!m_parentStack.isEmpty() || !parent->parentOrHostElement());
+    ASSERT(m_parentStack.isEmpty() || m_parentStack.last().element == parent->parentOrShadowHostElement());
+    ASSERT(!m_parentStack.isEmpty() || !parent->parentOrShadowHostElement());
     m_parentStack.append(ParentStackFrame(parent));
     ParentStackFrame& parentFrame = m_parentStack.last();
@@ -88 +88 @@
     m_ancestorIdentifierFilter = adoptPtr(new BloomFilter<bloomFilterKeyBits>);
     // Fast version if parent is a root element:
-    if (!parent->parentOrHostNode()) {
+    if (!parent->parentOrShadowHostNode()) {
         pushParentStackFrame(parent);
         return;
@@ -94 +94 @@
     // Otherwise climb up the tree.
     Vector<Element*, 30> ancestors;
-    for (Element* ancestor = parent; ancestor; ancestor = ancestor->parentOrHostElement())
+    for (Element* ancestor = parent; ancestor; ancestor = ancestor->parentOrShadowHostElement())
         ancestors.append(ancestor);
     for (size_t n = ancestors.size(); n; --n)
@@ -105 +105 @@
     // We may get invoked for some random elements in some wacky cases during style resolve.
     // Pause maintaining the stack in this case.
-    if (m_parentStack.last().element != parent->parentOrHostElement())
+    if (m_parentStack.last().element != parent->parentOrShadowHostElement())
         return;
     pushParentStackFrame(parent);

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -408 +408 @@
 void StyleResolver::pushParentElement(Element* parent)
 {
-    const ContainerNode* parentsParent = parent->parentOrHostElement();
+    const ContainerNode* parentsParent = parent->parentOrShadowHostElement();
 
     // We are not always invoked consistently. For example, script execution can cause us to enter
@@ -421 +421 @@
     // Note: We mustn't skip ShadowRoot nodes for the scope stack.
     if (m_scopeResolver)
-        m_scopeResolver->push(parent, parent->parentOrHostNode());
+        m_scopeResolver->push(parent, parent->parentOrShadowHostNode());
 }
 

trunk/Source/WebCore/css/StyleScopeResolver.cpp

@@ -102 +102 @@
     m_stack.shrink(0);
     int authorStyleBoundsIndex = 0;
-    for (const ContainerNode* scope = parent; scope; scope = scope->parentOrHostNode()) {
+    for (const ContainerNode* scope = parent; scope; scope = scope->parentOrShadowHostNode()) {
         RuleSet* ruleSet = ruleSetFor(scope);
         if (ruleSet)
@@ -148 +148 @@
         if (scope->isShadowRoot() && !toShadowRoot(scope)->applyAuthorStyles())
             --m_stackParentBoundsIndex;
-        m_stackParent = scope->parentOrHostNode();
+        m_stackParent = scope->parentOrShadowHostNode();
     }
 }

trunk/Source/WebCore/dom/Attr.cpp

@@ -82 +82 @@
         // This does everything appendChild() would do in this situation (assuming m_ignoreChildrenChanged was set),
         // but much more efficiently.
-        textNode->setParentOrHostNode(this);
+        textNode->setParentOrShadowHostNode(this);
         setFirstChild(textNode.get());
         setLastChild(textNode.get());

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

@@ -227 +227 @@
 {
     if (node->isPseudoElement())
-        return node->parentOrHostNode();
+        return node->parentOrShadowHostNode();
 
     if (!canCrossUpperBoundary() && node->isShadowRoot()) {

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -237 +237 @@
     // Check that this node is not "floating".
     // If it is, it can be deleted as a side effect of sending mutation events.
-    ASSERT(refCount() || parentOrHostNode());
+    ASSERT(refCount() || parentOrShadowHostNode());
 
     RefPtr<Node> protect(this);
@@ -320 +320 @@
         m_firstChild = newChild;
     }
-    newChild->setParentOrHostNode(this);
+    newChild->setParentOrShadowHostNode(this);
     newChild->setPreviousSibling(prev);
     newChild->setNextSibling(nextChild);
@@ -353 +353 @@
     // Check that this node is not "floating".
     // If it is, it can be deleted as a side effect of sending mutation events.
-    ASSERT(refCount() || parentOrHostNode());
+    ASSERT(refCount() || parentOrShadowHostNode());
 
     RefPtr<Node> protect(this);
@@ -475 +475 @@
     // Check that this node is not "floating".
     // If it is, it can be deleted as a side effect of sending mutation events.
-    ASSERT(refCount() || parentOrHostNode());
+    ASSERT(refCount() || parentOrShadowHostNode());
 
     RefPtr<Node> protect(this);
@@ -552 +552 @@
     oldChild->setPreviousSibling(0);
     oldChild->setNextSibling(0);
-    oldChild->setParentOrHostNode(0);
+    oldChild->setParentOrShadowHostNode(0);
 
     document()->adoptIfNeeded(oldChild);
@@ -609 +609 @@
                 n->setPreviousSibling(0);
                 n->setNextSibling(0);
-                n->setParentOrHostNode(0);
+                n->setParentOrShadowHostNode(0);
                 document()->adoptIfNeeded(n.get());
 
@@ -646 +646 @@
     // Check that this node is not "floating".
     // If it is, it can be deleted as a side effect of sending mutation events.
-    ASSERT(refCount() || parentOrHostNode());
+    ASSERT(refCount() || parentOrShadowHostNode());
 
     ec = 0;

trunk/Source/WebCore/dom/ContainerNode.h

@@ -267 +267 @@
     if (getFlag(NeedsShadowTreeWalkerFlag))
         return true;
-    ContainerNode* parent = parentOrHostNode();
+    ContainerNode* parent = parentOrShadowHostNode();
     return parent && parent->getFlag(NeedsShadowTreeWalkerFlag);
 }

trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h

@@ -109 +109 @@
 inline void appendChildToContainer(GenericNode* child, GenericNodeContainer* container)
 {
-    child->setParentOrHostNode(container);
+    child->setParentOrShadowHostNode(container);
 
     GenericNode* lastChild = container->lastChild();
@@ -165 +165 @@
             n->setPreviousSibling(0);
             n->setNextSibling(0);
-            n->setParentOrHostNode(0);
+            n->setParentOrShadowHostNode(0);
 
             if (!n->refCount()) {

trunk/Source/WebCore/dom/Document.cpp

@@ -5853 +5853 @@
     Node* newHoverNode = innerElementInDocument;
     while (newHoverNode && !newHoverNode->renderer())
-        newHoverNode = newHoverNode->parentOrHostNode();
+        newHoverNode = newHoverNode->parentOrShadowHostNode();
 
     // Update our current hover node.

trunk/Source/WebCore/dom/Document.h

@@ -1593 +1593 @@
 inline Node::Node(Document* document, ConstructionType type)
     : m_nodeFlags(type)
-    , m_parentOrHostNode(0)
+    , m_parentOrShadowHostNode(0)
     , m_treeScope(document)
     , m_previous(0)

trunk/Source/WebCore/dom/Element.cpp

@@ -2461 +2461 @@
 bool Element::isSpellCheckingEnabled() const
 {
-    for (const Element* element = this; element; element = element->parentOrHostElement()) {
+    for (const Element* element = this; element; element = element->parentOrShadowHostElement()) {
         switch (element->spellcheckAttributeState()) {
         case SpellcheckAttributeTrue:

trunk/Source/WebCore/dom/Element.h

@@ -860 +860 @@
     if (insertionPoint->inDocument())
         setFlag(InDocumentFlag);
-    if (parentOrHostNode()->isInShadowTree())
+    if (parentOrShadowHostNode()->isInShadowTree())
         setFlag(IsInShadowTreeFlag);
     return InsertionDone;

trunk/Source/WebCore/dom/ElementRareData.h

@@ -257 +257 @@
     ASSERT(!element->previousSibling());
 
-    element->setParentOrHostNode(0);
+    element->setParentOrShadowHostNode(0);
 }
 

trunk/Source/WebCore/dom/ElementShadow.cpp

@@ -37 +37 @@
     RefPtr<ShadowRoot> shadowRoot = ShadowRoot::create(shadowHost->document(), type);
 
-    shadowRoot->setParentOrHostNode(shadowHost);
+    shadowRoot->setParentOrShadowHostNode(shadowHost);
     shadowRoot->setParentTreeScope(shadowHost->treeScope());
     m_shadowRoots.push(shadowRoot.get());
@@ -70 +70 @@
 
         m_shadowRoots.removeHead();
-        oldRoot->setParentOrHostNode(0);
+        oldRoot->setParentOrShadowHostNode(0);
         oldRoot->setParentTreeScope(shadowHost->document());
         oldRoot->setPrev(0);

trunk/Source/WebCore/dom/Node.cpp

@@ -811 +811 @@
 inline void Node::markAncestorsWithChildNeedsStyleRecalc()
 {
-    for (ContainerNode* p = parentOrHostNode(); p && !p->childNeedsStyleRecalc(); p = p->parentOrHostNode())
+    for (ContainerNode* p = parentOrShadowHostNode(); p && !p->childNeedsStyleRecalc(); p = p->parentOrShadowHostNode())
         p->setChildNeedsStyleRecalc();
 
@@ -1036 +1036 @@
 bool Node::containsIncludingShadowDOM(const Node* node) const
 {
-    for (; node; node = node->parentOrHostNode()) {
+    for (; node; node = node->parentOrShadowHostNode()) {
         if (node == this)
             return true;
@@ -1052 +1052 @@
             node = static_cast<const TemplateContentDocumentFragment*>(node)->host();
         else
-            node = node->parentOrHostNode();
+            node = node->parentOrShadowHostNode();
     }
     return false;
@@ -1197 +1197 @@
 RenderStyle* Node::virtualComputedStyle(PseudoId pseudoElementSpecifier)
 {
-    return parentOrHostNode() ? parentOrHostNode()->computedStyle(pseudoElementSpecifier) : 0;
+    return parentOrShadowHostNode() ? parentOrShadowHostNode()->computedStyle(pseudoElementSpecifier) : 0;
 }
 
@@ -1220 +1220 @@
             return false;
     }
-    return parentOrHostNode() ? parentOrHostNode()->canStartSelection() : true;
+    return parentOrShadowHostNode() ? parentOrShadowHostNode()->canStartSelection() : true;
 }
 
@@ -1265 +1265 @@
 }
 
-Element* Node::parentOrHostElement() const
-{
-    ContainerNode* parent = parentOrHostNode();
+Element* Node::parentOrShadowHostElement() const
+{
+    ContainerNode* parent = parentOrShadowHostNode();
     if (!parent)
         return 0;
@@ -1902 +1902 @@
     Vector<const Node*, 16> chain;
     const Node* node = this;
-    while (node->parentOrHostNode()) {
+    while (node->parentOrShadowHostNode()) {
         chain.append(node);
-        node = node->parentOrHostNode();
+        node = node->parentOrShadowHostNode();
     }
     for (unsigned index = chain.size(); index > 0; --index) {
@@ -1959 +1959 @@
         StringBuilder indent;
         indent.append(baseIndent);
-        for (const Node* tmpNode = node; tmpNode && tmpNode != rootNode; tmpNode = tmpNode->parentOrHostNode())
+        for (const Node* tmpNode = node; tmpNode && tmpNode != rootNode; tmpNode = tmpNode->parentOrShadowHostNode())
             indent.append('\t');
         fprintf(stderr, "%s", indent.toString().utf8().data());
@@ -1976 +1976 @@
     const Node* rootNode;
     const Node* node = this;
-    while (node->parentOrHostNode() && !node->hasTagName(bodyTag))
-        node = node->parentOrHostNode();
+    while (node->parentOrShadowHostNode() && !node->hasTagName(bodyTag))
+        node = node->parentOrShadowHostNode();
     rootNode = node;
 
@@ -1998 +1998 @@
 }
 
-static ContainerNode* parentOrHostOrFrameOwner(const Node* node)
-{
-    ContainerNode* parent = node->parentOrHostNode();
+static ContainerNode* parentOrShadowHostOrFrameOwner(const Node* node)
+{
+    ContainerNode* parent = node->parentOrShadowHostNode();
     if (!parent && node->document() && node->document()->frame())
         parent = node->document()->frame()->ownerElement();
@@ -2028 +2028 @@
 {
     Node* rootNode = const_cast<Node*>(this);
-    while (parentOrHostOrFrameOwner(rootNode))
-        rootNode = parentOrHostOrFrameOwner(rootNode);
+    while (parentOrShadowHostOrFrameOwner(rootNode))
+        rootNode = parentOrShadowHostOrFrameOwner(rootNode);
     showSubTreeAcrossFrame(rootNode, this, "");
 }
@@ -2062 +2062 @@
 Node* Node::enclosingLinkEventParentOrSelf()
 {
-    for (Node* node = this; node; node = node->parentOrHostNode()) {
+    for (Node* node = this; node; node = node->parentOrShadowHostNode()) {
         // For imagemaps, the enclosing link node is the associated area element not the image itself.
         // So we don't let images be the enclosingLinkNode, even though isLink sometimes returns true
@@ -2491 +2491 @@
         Node* startNode = this;
         while (startNode && !startNode->renderer())
-            startNode = startNode->parentOrHostNode();
+            startNode = startNode->parentOrShadowHostNode();
         
         if (startNode && startNode->renderer())
@@ -2584 +2584 @@
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
     ScriptWrappable::reportMemoryUsage(memoryObjectInfo);
-    info.addMember(m_parentOrHostNode);
+    info.addMember(m_parentOrShadowHostNode);
     info.addMember(m_treeScope);
     info.addMember(m_next);
@@ -2628 +2628 @@
         return;
 
-    for (Node* node = parentOrHostNode(); node; node = node->parentOrHostNode())
+    for (Node* node = parentOrShadowHostNode(); node; node = node->parentOrShadowHostNode())
         node->decrementConnectedSubframeCount(count);
 }
@@ -2639 +2639 @@
         return;
 
-    for (Node* node = parentOrHostNode(); node; node = node->parentOrHostNode())
+    for (Node* node = parentOrShadowHostNode(); node; node = node->parentOrShadowHostNode())
         node->incrementConnectedSubframeCount(count);
 }

trunk/Source/WebCore/dom/Node.h

@@ -276 +276 @@
 
     // Node's parent, shadow tree host.
-    // FIXME: These methods should be renamed parentOrShadowHost*
-    ContainerNode* parentOrHostNode() const;
-    Element* parentOrHostElement() const;
-    void setParentOrHostNode(ContainerNode*);
+    ContainerNode* parentOrShadowHostNode() const;
+    Element* parentOrShadowHostElement() const;
+    void setParentOrShadowHostNode(ContainerNode*);
     Node* highestAncestor() const;
 
@@ -779 +778 @@
 
     void removedLastRef();
-    bool hasTreeSharedParent() const { return !!parentOrHostNode(); }
+    bool hasTreeSharedParent() const { return !!parentOrShadowHostNode(); }
 
     enum EditableLevel { Editable, RichlyEditable };
@@ -813 +812 @@
 
     mutable uint32_t m_nodeFlags;
-    ContainerNode* m_parentOrHostNode;
+    ContainerNode* m_parentOrShadowHostNode;
     TreeScope* m_treeScope;
     Node* m_previous;
@@ -849 +848 @@
 }
 
-inline void Node::setParentOrHostNode(ContainerNode* parent)
+inline void Node::setParentOrShadowHostNode(ContainerNode* parent)
 {
     ASSERT(isMainThread());
-    m_parentOrHostNode = parent;
+    m_parentOrShadowHostNode = parent;
 }
 
-inline ContainerNode* Node::parentOrHostNode() const
+inline ContainerNode* Node::parentOrShadowHostNode() const
 {
     ASSERT(isMainThreadOrGCThread());
-    return m_parentOrHostNode;
+    return m_parentOrShadowHostNode;
 }
 
 inline ContainerNode* Node::parentNode() const
 {
-    return isShadowRoot() ? 0 : parentOrHostNode();
+    return isShadowRoot() ? 0 : parentOrShadowHostNode();
 }
 
@@ -869 +868 @@
 {
     ASSERT(!isShadowRoot());
-    return parentOrHostNode();
+    return parentOrShadowHostNode();
 }
 

trunk/Source/WebCore/dom/PseudoElement.cpp

@@ -59 +59 @@
 {
     ASSERT(pseudoId != NOPSEUDO);
-    setParentOrHostNode(parent);
+    setParentOrShadowHostNode(parent);
     setHasCustomCallbacks();
 }
@@ -65 +65 @@
 PassRefPtr<RenderStyle> PseudoElement::customStyleForRenderer()
 {
-    return parentOrHostElement()->renderer()->getCachedPseudoStyle(m_pseudoId);
+    return parentOrShadowHostElement()->renderer()->getCachedPseudoStyle(m_pseudoId);
 }
 

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -65 +65 @@
     void setResetStyleInheritance(bool);
 
-    Element* host() const { return toElement(parentOrHostNode()); }
+    Element* host() const { return toElement(parentOrShadowHostNode()); }
     ElementShadow* owner() const { return host() ? host()->shadow() : 0; }
 

trunk/Source/WebCore/dom/Text.cpp

@@ -254 +254 @@
 static bool isSVGText(Text* text)
 {
-    Node* parentOrHostNode = text->parentOrHostNode();
-    return parentOrHostNode->isSVGElement() && !parentOrHostNode->hasTagName(SVGNames::foreignObjectTag);
+    Node* parentOrShadowHostNode = text->parentOrShadowHostNode();
+    return parentOrShadowHostNode->isSVGElement() && !parentOrShadowHostNode->hasTagName(SVGNames::foreignObjectTag);
 }
 #endif

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -1886 +1886 @@
                 return;
             }
-            target = target->parentOrHostNode(); 
+            target = target->parentOrShadowHostNode();
         }
         m_frame->document()->setFocusedNode(0);

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -178 +178 @@
 {
     unsigned depth = 0;
-    for (Node* parent = node->parentOrHostNode(); parent; parent = parent->parentOrHostNode())
+    for (Node* parent = node->parentOrShadowHostNode(); parent; parent = parent->parentOrShadowHostNode())
         ++depth;
     return depth;
@@ -194 +194 @@
             return next;
     }
-    for (Node* node = rangeEndContainer; node; node = node->parentOrHostNode()) {
+    for (Node* node = rangeEndContainer; node; node = node->parentOrShadowHostNode()) {
         if (Node* next = node->nextSibling())
             return next;
@@ -232 +232 @@
     // Put the nodes in a vector so we can iterate in reverse order.
     Vector<Node*, 100> ancestry;
-    for (Node* parent = node->parentOrHostNode(); parent; parent = parent->parentOrHostNode())
+    for (Node* parent = node->parentOrShadowHostNode(); parent; parent = parent->parentOrShadowHostNode())
         ancestry.append(parent);
 
@@ -428 +428 @@
             if (!next) {
                 bool pastEnd = NodeTraversal::next(m_node) == m_pastEndNode;
-                Node* parentNode = m_node->parentOrHostNode();
+                Node* parentNode = m_node->parentOrShadowHostNode();
                 while (!next && parentNode) {
                     if ((pastEnd && parentNode == m_endContainer) || m_endContainer->isDescendantOf(parentNode))
@@ -435 +435 @@
                     m_node = parentNode;
                     m_fullyClippedStack.pop();
-                    parentNode = m_node->parentOrHostNode();
+                    parentNode = m_node->parentOrShadowHostNode();
                     if (haveRenderer)
                         exitNode();
@@ -1236 +1236 @@
             // Exit all other containers.
             while (!m_node->previousSibling()) {
-                if (!advanceRespectingRange(m_node->parentOrHostNode()))
+                if (!advanceRespectingRange(m_node->parentOrShadowHostNode()))
                     break;
                 m_fullyClippedStack.pop();

trunk/Source/WebCore/html/HTMLFrameOwnerElement.cpp

@@ -59 +59 @@
     m_contentFrame = frame;
 
-    for (ContainerNode* node = this; node; node = node->parentOrHostNode())
+    for (ContainerNode* node = this; node; node = node->parentOrShadowHostNode())
         node->incrementConnectedSubframeCount();
 }
@@ -70 +70 @@
     m_contentFrame = 0;
 
-    for (ContainerNode* node = this; node; node = node->parentOrHostNode())
+    for (ContainerNode* node = this; node; node = node->parentOrShadowHostNode())
         node->decrementConnectedSubframeCount();
 }

trunk/Source/WebCore/html/HTMLFrameOwnerElement.h

@@ -94 +94 @@
     static bool canLoadFrame(HTMLFrameOwnerElement* owner)
     {
-        for (Node* node = owner; node; node = node->parentOrHostNode()) {
+        for (Node* node = owner; node; node = node->parentOrShadowHostNode()) {
             if (disabledSubtreeRoots().contains(node))
                 return false;

trunk/Source/WebCore/html/HTMLStyleElement.cpp

@@ -239 +239 @@
     // As written, such a stylesheet could style the host element, as well as children of the host.
     // OTOH, this paves the way for a :bound-element implementation.
-    ContainerNode* parentOrHost = parentOrHostNode();
-    if (!parentOrHost || !parentOrHost->isElementNode())
+    ContainerNode* parentOrShadowHost = parentOrShadowHostNode();
+    if (!parentOrShadowHost || !parentOrShadowHost->isElementNode())
         return 0;
 
-    return toElement(parentOrHost);
+    return toElement(parentOrShadowHost);
 }
 

trunk/Source/WebCore/html/MediaDocument.cpp

@@ -154 +154 @@
 {
     while (node && !node->hasTagName(videoTag))
-        node = node->parentOrHostNode();
+        node = node->parentOrShadowHostNode();
 
     return static_cast<HTMLVideoElement*>(node);

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -803 +803 @@
     ancestors.append(node);
     if (includeAncestors) {
-        for (ContainerNode* ancestor = node->parentOrHostNode(); ancestor; ancestor = ancestor->parentOrHostNode())
+        for (ContainerNode* ancestor = node->parentOrShadowHostNode(); ancestor; ancestor = ancestor->parentOrShadowHostNode())
             ancestors.append(ancestor);
     }

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2269 +2269 @@
                 break;
             }
-            node = node->parentOrHostNode();
+            node = node->parentOrShadowHostNode();
         }
 

trunk/Source/WebCore/page/TouchAdjustment.cpp

@@ -239 +239 @@
         Vector<Node*> visitedNodes;
         Node* respondingNode = 0;
-        for (Node* visitedNode = node; visitedNode; visitedNode = visitedNode->parentOrHostNode()) {
+        for (Node* visitedNode = node; visitedNode; visitedNode = visitedNode->parentOrShadowHostNode()) {
             // Check if we already have a result for a common ancestor from another candidate.
             respondingNode = responderMap.get(visitedNode);
@@ -249 +249 @@
                 respondingNode = visitedNode;
                 // Continue the iteration to collect the ancestors of the responder, which we will need later.
-                for (visitedNode = visitedNode->parentOrHostNode(); visitedNode; visitedNode = visitedNode->parentOrHostNode()) {
+                for (visitedNode = visitedNode->parentOrShadowHostNode(); visitedNode; visitedNode = visitedNode->parentOrShadowHostNode()) {
                     HashSet<Node*>::AddResult addResult = ancestorsToRespondersSet.add(visitedNode);
                     if (!addResult.isNewEntry)
@@ -282 +282 @@
         if (candidate->isContentEditable()) {
             Node* replacement = candidate;
-            Node* parent = candidate->parentOrHostNode();
+            Node* parent = candidate->parentOrShadowHostNode();
             while (parent && parent->isContentEditable()) {
                 replacement = parent;
@@ -290 +290 @@
                 }
                 editableAncestors.add(replacement);
-                parent = parent->parentOrHostNode();
+                parent = parent->parentOrShadowHostNode();
             }
             candidate = replacement;

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -269 +269 @@
 {
     if (n && n->isPseudoElement())
-        n = n->parentOrHostNode();
+        n = n->parentOrShadowHostNode();
     m_innerNode = n;
 }
@@ -276 +276 @@
 {
     if (n && n->isPseudoElement())
-        n = n->parentOrHostNode();
+        n = n->parentOrShadowHostNode();
     m_innerNonSharedNode = n;
 }

trunk/Source/WebCore/rendering/RenderObject.h

@@ -612 +612 @@
     // This is the same as node() except for renderers of :before and :after
     // pseudo elements for which their parent node is returned.
-    Node* generatingNode() const { return isPseudoElement() ? node()->parentOrHostNode() : node(); }
+    Node* generatingNode() const { return isPseudoElement() ? node()->parentOrShadowHostNode() : node(); }
 
     Document* document() const { return m_node->document(); }

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -792 +792 @@
     Node* parent;
     for (Node* n = node; n; n = parent) {
-        parent = n->parentOrHostNode();
+        parent = n->parentOrShadowHostNode();
         if (n != node)
             result.appendLiteral(" of ");

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -141 +141 @@
             break;
 
-        current = current->parentOrHostNode();
+        current = current->parentOrShadowHostNode();
     }
 }

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -122 +122 @@
     // for a <symbol> element or a cloned <svg> element in the referenced tree. In that case
     // we're always an inner <svg> element.
-    if (isInShadowTree() && parentOrHostElement() && parentOrHostElement()->isSVGElement())
+    if (isInShadowTree() && parentOrShadowHostElement() && parentOrShadowHostElement()->isSVGElement())
         return false;
 
@@ -188 +188 @@
 SVGSVGElement* SVGElement::ownerSVGElement() const
 {
-    ContainerNode* n = parentOrHostNode();
+    ContainerNode* n = parentOrShadowHostNode();
     while (n) {
         if (n->hasTagName(SVGNames::svgTag))
             return static_cast<SVGSVGElement*>(n);
 
-        n = n->parentOrHostNode();
+        n = n->parentOrShadowHostNode();
     }
 
@@ -203 +203 @@
     // This function needs shadow tree support - as RenderSVGContainer uses this function
     // to determine the "overflow" property. <use> on <symbol> wouldn't work otherwhise.
-    ContainerNode* n = parentOrHostNode();
+    ContainerNode* n = parentOrShadowHostNode();
     while (n) {
         if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::symbolTag))
             return static_cast<SVGElement*>(n);
 
-        n = n->parentOrHostNode();
+        n = n->parentOrShadowHostNode();
     }
 
@@ -442 +442 @@
         return true;
 
-    for (element = element->parentOrHostElement(); element; element = element->parentOrHostElement()) {
+    for (element = element->parentOrShadowHostElement(); element; element = element->parentOrShadowHostElement()) {
         const EventListenerVector& entry = element->getEventListeners(eventNames().loadEvent);
         for (size_t i = 0; i < entry.size(); ++i) {
@@ -459 +459 @@
         RefPtr<Element> parent;
         if (sendParentLoadEvents)
-            parent = currentTarget->parentOrHostElement(); // save the next parent to dispatch too incase dispatching the event changes the tree
+            parent = currentTarget->parentOrShadowHostElement(); // save the next parent to dispatch too incase dispatching the event changes the tree
         if (hasLoadListener(currentTarget.get()))
             currentTarget->dispatchEvent(Event::create(eventNames().loadEvent, false, false));
@@ -586 +586 @@
 
     RenderStyle* style = 0;
-    if (Element* parent = parentOrHostElement()) {
+    if (Element* parent = parentOrShadowHostElement()) {
         if (RenderObject* renderer = parent->renderer())
             style = renderer->style();
@@ -618 +618 @@
 
     RenderStyle* parentStyle = 0;
-    if (Element* parent = parentOrHostElement()) {
+    if (Element* parent = parentOrShadowHostElement()) {
         if (RenderObject* renderer = parent->renderer())
             parentStyle = renderer->style();

trunk/Source/WebCore/svg/SVGElementInstance.h

@@ -48 +48 @@
     virtual ~SVGElementInstance();
 
-    void setParentOrHostNode(SVGElementInstance* instance) { m_parentInstance = instance; }
+    void setParentOrShadowHostNode(SVGElementInstance* instance) { m_parentInstance = instance; }
 
     virtual const AtomicString& interfaceName() const;

trunk/Source/WebCore/svg/SVGForeignObjectElement.cpp

@@ -154 +154 @@
     // Note that we currently do not support foreignObject instantiation via <use>, hence it is safe
     // to use parentElement() here. If that changes, this method should be updated to use
-    // parentOrHostElement() instead.
+    // parentOrShadowHostElement() instead.
     Element* ancestor = parentElement();
     while (ancestor && ancestor->isSVGElement()) {

trunk/Source/WebCore/svg/SVGGElement.cpp

@@ -113 +113 @@
     // Unlike SVGStyledElement::rendererIsNeeded(), we still create renderers, even if
     // display is set to 'none' - which is special to SVG <g> container elements.
-    return parentOrHostElement() && parentOrHostElement()->isSVGElement();
+    return parentOrShadowHostElement() && parentOrShadowHostElement()->isSVGElement();
 }
 

trunk/Source/WebCore/svg/SVGLocatable.cpp

@@ -44 +44 @@
 {
     ASSERT(element);
-    for (Element* current = element->parentOrHostElement(); current; current = current->parentOrHostElement()) {
+    for (Element* current = element->parentOrShadowHostElement(); current; current = current->parentOrShadowHostElement()) {
         if (isViewportElement(current))
             return static_cast<SVGElement*>(current);
@@ -56 +56 @@
     ASSERT(element);
     SVGElement* farthest = 0;
-    for (Element* current = element->parentOrHostElement(); current; current = current->parentOrHostElement()) {
+    for (Element* current = element->parentOrShadowHostElement(); current; current = current->parentOrShadowHostElement()) {
         if (isViewportElement(current))
             farthest = static_cast<SVGElement*>(current);
@@ -85 +85 @@
 
     SVGElement* stopAtElement = mode == NearestViewportScope ? nearestViewportElement(element) : 0;
-    for (Element* currentElement = element; currentElement; currentElement = currentElement->parentOrHostElement()) {
+    for (Element* currentElement = element; currentElement; currentElement = currentElement->parentOrShadowHostElement()) {
         if (!currentElement->isSVGElement())
             break;

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -123 +123 @@
     // with the SVG content. In general, the SVG user agent will include the unknown
     // elements in the DOM but will otherwise ignore unknown elements. 
-    if (!parentOrHostElement() || parentOrHostElement()->isSVGElement())
+    if (!parentOrShadowHostElement() || parentOrShadowHostElement()->isSVGElement())
         return StyledElement::rendererIsNeeded(context);
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-31  Changhun Kang  <temoochin@company100.net>
+
+        Rename from parentOrHost* to parentOrShadowHost* in Node.h.
+        https://bugs.webkit.org/show_bug.cgi?id=108308
+
+        Reviewed by Dimitri Glazkov.
+
 2013-01-31  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1769 +1769 @@
         // Find the node to highlight. This is not the same as the node responding the tap gesture, because many
         // pages has a global click handler and we do not want to highlight the body.
-        for (Node* node = adjustedNode; node; node = node->parentOrHostNode()) {
+        for (Node* node = adjustedNode; node; node = node->parentOrShadowHostNode()) {
             if (node->isDocumentNode() || node->isFrameOwnerElement())
                 break;