Changeset 117210 in webkit


Ignore:
Timestamp:
May 15, 2012 8:07:12 PM (12 years ago)
Author:
shinyak@chromium.org
Message:

Rename Node::shadowTreeRootNode() to Node::shadowRoot()
https://bugs.webkit.org/show_bug.cgi?id=86449

Reviewed by Darin Adler.

Source/WebCore:

Since Node::shadowTreeRootNode() returns always a ShadowRoot now, shadowRoot() is
mure suitable than shadowTreeRootNode().

This patch changes the method name.

No new tests, no change in behavior.

  • WebCore.order:
  • dom/Node.cpp:

(WebCore::Node::rendererIsEditable):
(WebCore::Node::shadowAncestorNode):
(WebCore::Node::shadowRoot):

  • dom/Node.h:

(Node):

  • dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::NodeRenderingContext):

  • dom/Range.cpp:

(WebCore::Range::shadowRoot):

  • dom/Range.h:

(Range):

  • editing/Editor.cpp:

(WebCore::Editor::nextVisibleRange):
(WebCore::Editor::countMatchesForText):

  • editing/TextIterator.cpp:

(WebCore::TextIterator::handleReplacedElement):

  • editing/htmlediting.cpp:

(WebCore::indexForVisiblePosition):

  • html/shadow/ContentSelectorQuery.cpp:

(WebCore::ContentSelectorQuery::matches):

  • html/shadow/HTMLContentElement.cpp:

(WebCore::HTMLContentElement::parseAttribute):

  • html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::detach):

  • page/EventHandler.cpp:

(WebCore::instanceAssociatedWithShadowTreeElement):

  • svg/SVGElement.cpp:

(WebCore::SVGElement::correspondingElement):
(WebCore::collectInstancesForSVGElement):

Source/WebKit/chromium:

  • src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::scopeStringMatches):

Location:
trunk/Source
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r117209 r117210  
     12012-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
    1472012-05-15  Nico Weber  <thakis@chromium.org>
    248
  • trunk/Source/WebCore/WebCore.order

    r116371 r117210  
    46594659__ZN7WebCore16VisibleSelection52setStartAndEndFromBaseAndExtentRespectingGranularityENS_15TextGranularityE
    46604660__ZN7WebCore16VisibleSelection46adjustSelectionToAvoidCrossingShadowBoundariesEv
    4661 __ZN7WebCore4Node18shadowTreeRootNodeEv
     4661__ZN7WebCore4Node10shadowRootEv
    46624662__ZN7WebCore16VisibleSelection47adjustSelectionToAvoidCrossingEditingBoundariesEv
    46634663__ZN7WebCore22lowestEditableAncestorEPNS_4NodeE
  • trunk/Source/WebCore/dom/Node.cpp

    r117086 r117210  
    728728bool Node::rendererIsEditable(EditableLevel editableLevel) const
    729729{
    730     if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable() && !shadowTreeRootNode())
     730    if (document()->frame() && document()->frame()->page() && document()->frame()->page()->isEditable() && !shadowRoot())
    731731        return true;
    732732
     
    14961496#endif
    14971497
    1498     if (ShadowRoot* root = shadowTreeRootNode())
     1498    if (ShadowRoot* root = shadowRoot())
    14991499        return root->host();
    15001500
     
    15021502}
    15031503
    1504 ShadowRoot* Node::shadowTreeRootNode() const
     1504ShadowRoot* Node::shadowRoot() const
    15051505{
    15061506    Node* root = const_cast<Node*>(this);
  • trunk/Source/WebCore/dom/Node.h

    r117036 r117210  
    222222
    223223    Node* shadowAncestorNode() const;
    224     // Returns 0, a ShadowRoot, or a legacy shadow root.
    225     ShadowRoot* shadowTreeRootNode() const;
     224    ShadowRoot* shadowRoot() const;
    226225    // Returns 0, a child of ShadowRoot, or a legacy shadow root.
    227226    Node* nonBoundaryShadowTreeRootNode();
  • trunk/Source/WebCore/dom/NodeRenderingContext.cpp

    r117036 r117210  
    7979        if (m_visualParentShadow) {
    8080            if ((m_insertionPoint = m_visualParentShadow->insertionPointFor(m_node))) {
    81                 if (m_insertionPoint->shadowTreeRootNode()->isUsedForRendering()) {
     81                if (m_insertionPoint->shadowRoot()->isUsedForRendering()) {
    8282                    m_phase = AttachingDistributed;
    8383                    m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_insertionPoint).parentNodeForRenderingAndStyle();
     
    9292
    9393        if (isShadowBoundary(parent)) {
    94             if (!parent->shadowTreeRootNode()->isUsedForRendering()) {
     94            if (!parent->shadowRoot()->isUsedForRendering()) {
    9595                m_phase = AttachingNotDistributed;
    9696                m_parentNodeForRenderingAndStyle = parent;
  • trunk/Source/WebCore/dom/Range.cpp

    r117036 r117210  
    16521652}
    16531653
    1654 ShadowRoot* Range::shadowTreeRootNode() const
    1655 {
    1656     return startContainer() ? startContainer()->shadowTreeRootNode() : 0;
     1654ShadowRoot* Range::shadowRoot() const
     1655{
     1656    return startContainer() ? startContainer()->shadowRoot() : 0;
    16571657}
    16581658
  • trunk/Source/WebCore/dom/Range.h

    r117036 r117210  
    112112    Node* pastLastNode() const;
    113113
    114     ShadowRoot* shadowTreeRootNode() const;
     114    ShadowRoot* shadowRoot() const;
    115115
    116116    IntRect boundingBox();
  • trunk/Source/WebCore/editing/Editor.cpp

    r117036 r117210  
    25202520            searchRange->setEndBefore(resultRange->startContainer(), ec);
    25212521
    2522         Node* shadowTreeRoot = searchRange->shadowTreeRootNode();
    2523         if (searchRange->collapsed(ec) && shadowTreeRoot) {
     2522        ShadowRoot* shadowRoot = searchRange->shadowRoot();
     2523        if (searchRange->collapsed(ec) && shadowRoot) {
    25242524            if (forward)
    2525                 searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
     2525                searchRange->setEnd(shadowRoot, shadowRoot->childNodeCount(), ec);
    25262526            else
    2527                 searchRange->setStartBefore(shadowTreeRoot, ec);
     2527                searchRange->setStartBefore(shadowRoot, ec);
    25282528        }
    25292529       
     
    28832883        searchRange->setStart(resultRange->endContainer(exception), resultRange->endOffset(exception), exception);
    28842884
    2885         Node* shadowTreeRoot = searchRange->shadowTreeRootNode();
     2885        Node* shadowTreeRoot = searchRange->shadowRoot();
    28862886        if (searchRange->collapsed(exception) && shadowTreeRoot)
    28872887            searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), exception);
  • trunk/Source/WebCore/editing/TextIterator.cpp

    r117041 r117210  
    665665    if (m_entersTextControls && renderer->isTextControl()) {
    666666        if (HTMLElement* innerTextElement = toRenderTextControl(renderer)->textFormControlElement()->innerTextElement()) {
    667             m_node = innerTextElement->shadowTreeRootNode();
     667            m_node = innerTextElement->shadowRoot();
    668668            pushFullyClippedState(m_fullyClippedStack, m_node);
    669669            m_offset = 0;
  • trunk/Source/WebCore/editing/htmlediting.cpp

    r117116 r117210  
    10941094    Position p(visiblePosition.deepEquivalent());
    10951095    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)
    11011099        scope = shadowRoot;
    1102     } else
     1100    else
    11031101        scope = document->documentElement();
    11041102
  • trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp

    r117036 r117210  
    6565        return false;
    6666
    67     ASSERT(node->parentNode() == m_insertionPoint->shadowTreeRootNode()->shadowHost());
     67    ASSERT(node->parentNode() == m_insertionPoint->shadowRoot()->shadowHost());
    6868
    6969    if (m_insertionPoint->select().isNull() || m_insertionPoint->select().isEmpty())
  • trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp

    r117195 r117210  
    9090{
    9191    if (attribute.name() == selectAttr) {
    92         if (ShadowRoot* root = shadowTreeRootNode())
     92        if (ShadowRoot* root = shadowRoot())
    9393            root->owner()->setNeedsRedistributing();
    9494    } else
  • trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

    r117036 r117210  
    6565void InsertionPoint::detach()
    6666{
    67     ShadowRoot* root = shadowTreeRootNode();
     67    ShadowRoot* root = shadowRoot();
    6868    if (root && isActive()) {
    6969        ElementShadow* shadow = root->owner();
  • trunk/Source/WebCore/page/EventHandler.cpp

    r117098 r117210  
    20932093        return 0;
    20942094
    2095     Node* shadowTreeElement = referenceNode->shadowTreeRootNode();
     2095    Node* shadowTreeElement = referenceNode->shadowRoot();
    20962096    if (!shadowTreeElement)
    20972097        return 0;
  • trunk/Source/WebCore/svg/SVGElement.cpp

    r117195 r117210  
    297297SVGElement* SVGElement::correspondingElement()
    298298{
    299     ASSERT(!hasRareSVGData() || !rareSVGData()->correspondingElement() || shadowTreeRootNode());
     299    ASSERT(!hasRareSVGData() || !rareSVGData()->correspondingElement() || shadowRoot());
    300300    return hasRareSVGData() ? rareSVGData()->correspondingElement() : 0;
    301301}
     
    352352{
    353353    ASSERT(element);
    354     if (element->shadowTreeRootNode())
     354    if (element->shadowRoot())
    355355        return;
    356356
  • trunk/Source/WebKit/chromium/ChangeLog

    r117204 r117210  
     12012-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
    1112012-05-15  Mark Pilgrim  <pilgrim@chromium.org>
    212
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r117200 r117210  
    17851785        searchRange->setStart(resultRange->endContainer(ec), resultRange->endOffset(ec), ec);
    17861786
    1787         Node* shadowTreeRoot = searchRange->shadowTreeRootNode();
     1787        Node* shadowTreeRoot = searchRange->shadowRoot();
    17881788        if (searchRange->collapsed(ec) && shadowTreeRoot)
    17891789            searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
Note: See TracChangeset for help on using the changeset viewer.