Changeset 117210 in webkit
- Timestamp:
- May 15, 2012 8:07:12 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r117209 r117210 1 2012-05-15 Shinya Kawanaka <shinyak@chromium.org> 2 3 Rename Node::shadowTreeRootNode() to Node::shadowRoot() 4 https://bugs.webkit.org/show_bug.cgi?id=86449 5 6 Reviewed by Darin Adler. 7 8 Since Node::shadowTreeRootNode() returns always a ShadowRoot now, shadowRoot() is 9 mure suitable than shadowTreeRootNode(). 10 11 This patch changes the method name. 12 13 No new tests, no change in behavior. 14 15 * WebCore.order: 16 * dom/Node.cpp: 17 (WebCore::Node::rendererIsEditable): 18 (WebCore::Node::shadowAncestorNode): 19 (WebCore::Node::shadowRoot): 20 * dom/Node.h: 21 (Node): 22 * dom/NodeRenderingContext.cpp: 23 (WebCore::NodeRenderingContext::NodeRenderingContext): 24 * dom/Range.cpp: 25 (WebCore::Range::shadowRoot): 26 * dom/Range.h: 27 (Range): 28 * editing/Editor.cpp: 29 (WebCore::Editor::nextVisibleRange): 30 (WebCore::Editor::countMatchesForText): 31 * editing/TextIterator.cpp: 32 (WebCore::TextIterator::handleReplacedElement): 33 * editing/htmlediting.cpp: 34 (WebCore::indexForVisiblePosition): 35 * html/shadow/ContentSelectorQuery.cpp: 36 (WebCore::ContentSelectorQuery::matches): 37 * html/shadow/HTMLContentElement.cpp: 38 (WebCore::HTMLContentElement::parseAttribute): 39 * html/shadow/InsertionPoint.cpp: 40 (WebCore::InsertionPoint::detach): 41 * page/EventHandler.cpp: 42 (WebCore::instanceAssociatedWithShadowTreeElement): 43 * svg/SVGElement.cpp: 44 (WebCore::SVGElement::correspondingElement): 45 (WebCore::collectInstancesForSVGElement): 46 1 47 2012-05-15 Nico Weber <thakis@chromium.org> 2 48 -
trunk/Source/WebCore/WebCore.order
r116371 r117210 4659 4659 __ZN7WebCore16VisibleSelection52setStartAndEndFromBaseAndExtentRespectingGranularityENS_15TextGranularityE 4660 4660 __ZN7WebCore16VisibleSelection46adjustSelectionToAvoidCrossingShadowBoundariesEv 4661 __ZN7WebCore4Node1 8shadowTreeRootNodeEv4661 __ZN7WebCore4Node10shadowRootEv 4662 4662 __ZN7WebCore16VisibleSelection47adjustSelectionToAvoidCrossingEditingBoundariesEv 4663 4663 __ZN7WebCore22lowestEditableAncestorEPNS_4NodeE -
trunk/Source/WebCore/dom/Node.cpp
r117086 r117210 728 728 bool Node::rendererIsEditable(EditableLevel editableLevel) const 729 729 { 730 if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable() && !shadow TreeRootNode())730 if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable() && !shadowRoot()) 731 731 return true; 732 732 … … 1496 1496 #endif 1497 1497 1498 if (ShadowRoot* root = shadow TreeRootNode())1498 if (ShadowRoot* root = shadowRoot()) 1499 1499 return root->host(); 1500 1500 … … 1502 1502 } 1503 1503 1504 ShadowRoot* Node::shadow TreeRootNode() const1504 ShadowRoot* Node::shadowRoot() const 1505 1505 { 1506 1506 Node* root = const_cast<Node*>(this); -
trunk/Source/WebCore/dom/Node.h
r117036 r117210 222 222 223 223 Node* shadowAncestorNode() const; 224 // Returns 0, a ShadowRoot, or a legacy shadow root. 225 ShadowRoot* shadowTreeRootNode() const; 224 ShadowRoot* shadowRoot() const; 226 225 // Returns 0, a child of ShadowRoot, or a legacy shadow root. 227 226 Node* nonBoundaryShadowTreeRootNode(); -
trunk/Source/WebCore/dom/NodeRenderingContext.cpp
r117036 r117210 79 79 if (m_visualParentShadow) { 80 80 if ((m_insertionPoint = m_visualParentShadow->insertionPointFor(m_node))) { 81 if (m_insertionPoint->shadow TreeRootNode()->isUsedForRendering()) {81 if (m_insertionPoint->shadowRoot()->isUsedForRendering()) { 82 82 m_phase = AttachingDistributed; 83 83 m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_insertionPoint).parentNodeForRenderingAndStyle(); … … 92 92 93 93 if (isShadowBoundary(parent)) { 94 if (!parent->shadow TreeRootNode()->isUsedForRendering()) {94 if (!parent->shadowRoot()->isUsedForRendering()) { 95 95 m_phase = AttachingNotDistributed; 96 96 m_parentNodeForRenderingAndStyle = parent; -
trunk/Source/WebCore/dom/Range.cpp
r117036 r117210 1652 1652 } 1653 1653 1654 ShadowRoot* Range::shadow TreeRootNode() const1655 { 1656 return startContainer() ? startContainer()->shadow TreeRootNode() : 0;1654 ShadowRoot* Range::shadowRoot() const 1655 { 1656 return startContainer() ? startContainer()->shadowRoot() : 0; 1657 1657 } 1658 1658 -
trunk/Source/WebCore/dom/Range.h
r117036 r117210 112 112 Node* pastLastNode() const; 113 113 114 ShadowRoot* shadow TreeRootNode() const;114 ShadowRoot* shadowRoot() const; 115 115 116 116 IntRect boundingBox(); -
trunk/Source/WebCore/editing/Editor.cpp
r117036 r117210 2520 2520 searchRange->setEndBefore(resultRange->startContainer(), ec); 2521 2521 2522 Node* shadowTreeRoot = searchRange->shadowTreeRootNode();2523 if (searchRange->collapsed(ec) && shadow TreeRoot) {2522 ShadowRoot* shadowRoot = searchRange->shadowRoot(); 2523 if (searchRange->collapsed(ec) && shadowRoot) { 2524 2524 if (forward) 2525 searchRange->setEnd(shadow TreeRoot, shadowTreeRoot->childNodeCount(), ec);2525 searchRange->setEnd(shadowRoot, shadowRoot->childNodeCount(), ec); 2526 2526 else 2527 searchRange->setStartBefore(shadow TreeRoot, ec);2527 searchRange->setStartBefore(shadowRoot, ec); 2528 2528 } 2529 2529 … … 2883 2883 searchRange->setStart(resultRange->endContainer(exception), resultRange->endOffset(exception), exception); 2884 2884 2885 Node* shadowTreeRoot = searchRange->shadow TreeRootNode();2885 Node* shadowTreeRoot = searchRange->shadowRoot(); 2886 2886 if (searchRange->collapsed(exception) && shadowTreeRoot) 2887 2887 searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), exception); -
trunk/Source/WebCore/editing/TextIterator.cpp
r117041 r117210 665 665 if (m_entersTextControls && renderer->isTextControl()) { 666 666 if (HTMLElement* innerTextElement = toRenderTextControl(renderer)->textFormControlElement()->innerTextElement()) { 667 m_node = innerTextElement->shadow TreeRootNode();667 m_node = innerTextElement->shadowRoot(); 668 668 pushFullyClippedState(m_fullyClippedStack, m_node); 669 669 m_offset = 0; -
trunk/Source/WebCore/editing/htmlediting.cpp
r117116 r117210 1094 1094 Position p(visiblePosition.deepEquivalent()); 1095 1095 Document* document = p.anchorNode()->document(); 1096 ContainerNode* shadowRoot = p.anchorNode()->shadowTreeRootNode(); 1097 1098 if (shadowRoot) { 1099 // Use the shadow root for form elements, since TextIterators will not enter shadow content. 1100 ASSERT(shadowRoot->isElementNode() || shadowRoot->isShadowRoot()); 1096 ShadowRoot* shadowRoot = p.anchorNode()->shadowRoot(); 1097 1098 if (shadowRoot) 1101 1099 scope = shadowRoot; 1102 }else1100 else 1103 1101 scope = document->documentElement(); 1104 1102 -
trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp
r117036 r117210 65 65 return false; 66 66 67 ASSERT(node->parentNode() == m_insertionPoint->shadow TreeRootNode()->shadowHost());67 ASSERT(node->parentNode() == m_insertionPoint->shadowRoot()->shadowHost()); 68 68 69 69 if (m_insertionPoint->select().isNull() || m_insertionPoint->select().isEmpty()) -
trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp
r117195 r117210 90 90 { 91 91 if (attribute.name() == selectAttr) { 92 if (ShadowRoot* root = shadow TreeRootNode())92 if (ShadowRoot* root = shadowRoot()) 93 93 root->owner()->setNeedsRedistributing(); 94 94 } else -
trunk/Source/WebCore/html/shadow/InsertionPoint.cpp
r117036 r117210 65 65 void InsertionPoint::detach() 66 66 { 67 ShadowRoot* root = shadow TreeRootNode();67 ShadowRoot* root = shadowRoot(); 68 68 if (root && isActive()) { 69 69 ElementShadow* shadow = root->owner(); -
trunk/Source/WebCore/page/EventHandler.cpp
r117098 r117210 2093 2093 return 0; 2094 2094 2095 Node* shadowTreeElement = referenceNode->shadow TreeRootNode();2095 Node* shadowTreeElement = referenceNode->shadowRoot(); 2096 2096 if (!shadowTreeElement) 2097 2097 return 0; -
trunk/Source/WebCore/svg/SVGElement.cpp
r117195 r117210 297 297 SVGElement* SVGElement::correspondingElement() 298 298 { 299 ASSERT(!hasRareSVGData() || !rareSVGData()->correspondingElement() || shadow TreeRootNode());299 ASSERT(!hasRareSVGData() || !rareSVGData()->correspondingElement() || shadowRoot()); 300 300 return hasRareSVGData() ? rareSVGData()->correspondingElement() : 0; 301 301 } … … 352 352 { 353 353 ASSERT(element); 354 if (element->shadow TreeRootNode())354 if (element->shadowRoot()) 355 355 return; 356 356 -
trunk/Source/WebKit/chromium/ChangeLog
r117204 r117210 1 2012-05-15 Shinya Kawanaka <shinyak@chromium.org> 2 3 Rename Node::shadowTreeRootNode() to Node::shadowRoot() 4 https://bugs.webkit.org/show_bug.cgi?id=86449 5 6 Reviewed by Darin Adler. 7 8 * src/WebFrameImpl.cpp: 9 (WebKit::WebFrameImpl::scopeStringMatches): 10 1 11 2012-05-15 Mark Pilgrim <pilgrim@chromium.org> 2 12 -
trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp
r117200 r117210 1785 1785 searchRange->setStart(resultRange->endContainer(ec), resultRange->endOffset(ec), ec); 1786 1786 1787 Node* shadowTreeRoot = searchRange->shadow TreeRootNode();1787 Node* shadowTreeRoot = searchRange->shadowRoot(); 1788 1788 if (searchRange->collapsed(ec) && shadowTreeRoot) 1789 1789 searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
Note: See TracChangeset
for help on using the changeset viewer.