Changeset 108959 in webkit


Ignore:
Timestamp:
Feb 26, 2012 10:50:19 PM (12 years ago)
Author:
shinyak@chromium.org
Message:

Rename ShadowRootList to ShadowTree.
https://bugs.webkit.org/show_bug.cgi?id=79342

Reviewed by Hajime Morita.

.:

  • Source/autotools/symbols.filter:

Source/WebCore:

This patch renames ShadowRootList ot ShadowTree.

No new tests, no change in behavior.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.exp.in:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/DOMAllInOne.cpp:
  • dom/Document.cpp:

(WebCore::Document::buildAccessKeyMap):

  • dom/Element.cpp:

(WebCore::Element::willRemove):
(WebCore::Element::insertedIntoDocument):
(WebCore::Element::removedFromDocument):
(WebCore::Element::insertedIntoTree):
(WebCore::Element::removedFromTree):
(WebCore::Element::attach):
(WebCore::Element::detach):
(WebCore::Element::recalcStyle):
(WebCore::Element::hasShadowRoot):
(WebCore::Element::shadowTree):
(WebCore::Element::setShadowRoot):
(WebCore::Element::ensureShadowRoot):
(WebCore::Element::removeShadowRoot):
(WebCore::Element::childrenChanged):

  • dom/Element.h:

(WebCore):
(Element):

  • dom/ElementRareData.h:

(ElementRareData):
(WebCore::ElementRareData::~ElementRareData):

  • dom/Node.cpp:

(WebCore::oldestShadowRoot):

  • dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::NodeRenderingContext):
(WebCore::NodeRenderingContext::hostChildrenChanged):
(WebCore::NodeRenderingContext::shouldCreateRenderer):

  • dom/NodeRenderingContext.h:

(WebCore):

  • dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::tree):
(WebCore::ShadowRoot::attach):

  • dom/ShadowRoot.h:

(WebCore):
(ShadowRoot):

  • dom/ShadowTree.cpp: Renamed from Source/WebCore/dom/ShadowRootList.cpp.

(WebCore):
(WebCore::ShadowTree::ShadowTree):
(WebCore::ShadowTree::~ShadowTree):
(WebCore::ShadowTree::pushShadowRoot):
(WebCore::ShadowTree::popShadowRoot):
(WebCore::ShadowTree::insertedIntoDocument):
(WebCore::ShadowTree::removedFromDocument):
(WebCore::ShadowTree::insertedIntoTree):
(WebCore::ShadowTree::removedFromTree):
(WebCore::ShadowTree::willRemove):
(WebCore::ShadowTree::attach):
(WebCore::ShadowTree::detach):
(WebCore::ShadowTree::insertionPointFor):
(WebCore::ShadowTree::isSelectorActive):
(WebCore::ShadowTree::reattach):
(WebCore::ShadowTree::childNeedsStyleRecalc):
(WebCore::ShadowTree::needsStyleRecalc):
(WebCore::ShadowTree::recalcShadowTreeStyle):
(WebCore::ShadowTree::needsReattachHostChildrenAndShadow):
(WebCore::ShadowTree::hostChildrenChanged):
(WebCore::ShadowTree::setNeedsReattachHostChildrenAndShadow):
(WebCore::ShadowTree::reattachHostChildrenAndShadow):
(WebCore::ShadowTree::ensureSelector):

  • dom/ShadowTree.h: Renamed from Source/WebCore/dom/ShadowRootList.h.

(WebCore):
(ShadowTree):
(WebCore::ShadowTree::hasShadowRoot):
(WebCore::ShadowTree::youngestShadowRoot):
(WebCore::ShadowTree::oldestShadowRoot):
(WebCore::ShadowTree::selector):
(WebCore::ShadowTree::clearNeedsReattachHostChildrenAndShadow):
(WebCore::ShadowTree::host):

  • dom/TreeScopeAdopter.cpp:

(WebCore::shadowRootFor):

  • html/ColorInputType.cpp:

(WebCore::ColorInputType::createShadowSubtree):
(WebCore::ColorInputType::shadowColorSwatch):

  • html/FileInputType.cpp:

(WebCore::FileInputType::createShadowSubtree):
(WebCore::FileInputType::multipleAttributeChanged):

  • html/HTMLDetailsElement.cpp:

(WebCore::HTMLDetailsElement::findMainSummary):

  • html/HTMLKeygenElement.cpp:

(WebCore::HTMLKeygenElement::shadowSelect):

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaControls):
(WebCore::HTMLMediaElement::hasMediaControls):

  • html/HTMLSummaryElement.cpp:
  • html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::innerTextElement):
(WebCore::HTMLTextAreaElement::updatePlaceholderText):

  • html/InputType.cpp:

(WebCore::InputType::destroyShadowSubtree):

  • html/RangeInputType.cpp:

(WebCore::RangeInputType::handleMouseDownEvent):
(WebCore::RangeInputType::createShadowSubtree):

  • html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::createShadowSubtree):
(WebCore::TextFieldInputType::updatePlaceholderText):

  • html/ValidationMessage.cpp:

(WebCore::ValidationMessage::deleteBubbleTree):

  • html/shadow/HTMLContentElement.cpp:

(WebCore::HTMLContentElement::attach):
(WebCore::HTMLContentElement::detach):
(WebCore::HTMLContentElement::parseAttribute):

  • html/shadow/SliderThumbElement.cpp:

(WebCore::sliderThumbElementOf):
(WebCore::RenderSliderContainer::layout):
(WebCore::trackLimiterElementOf):

  • page/FocusController.cpp:

(WebCore::shadowRoot):

  • rendering/RenderFileUploadControl.cpp:

(WebCore::RenderFileUploadControl::uploadButton):

  • svg/SVGTRefElement.cpp:

(WebCore::SVGTRefElement::updateReferencedText):
(WebCore::SVGTRefElement::detachTarget):

  • testing/Internals.cpp:

(WebCore::Internals::ensureShadowRoot):
(WebCore::Internals::youngestShadowRoot):
(WebCore::Internals::oldestShadowRoot):

Source/WebKit2:

  • win/WebKit2.def:
  • win/WebKit2CFLite.def:
Location:
trunk
Files:
40 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r108953 r108959  
     12012-02-26  Shinya Kawanaka  <shinyak@chromium.org>
     2
     3        Rename ShadowRootList to ShadowTree.
     4        https://bugs.webkit.org/show_bug.cgi?id=79342
     5
     6        Reviewed by Hajime Morita.
     7
     8        * Source/autotools/symbols.filter:
     9
    1102012-02-26  Chang Wan Hong  <jourmoon@company100.net>
    211
  • trunk/Source/WebCore/CMakeLists.txt

    r108958 r108959  
    616616    dom/SelectorQuery.cpp
    617617    dom/ShadowRoot.cpp
    618     dom/ShadowRootList.cpp
     618    dom/ShadowTree.cpp
    619619    dom/SpaceSplitString.cpp
    620620    dom/StaticHashSetNodeList.cpp
  • trunk/Source/WebCore/ChangeLog

    r108958 r108959  
     12012-02-26  Shinya Kawanaka  <shinyak@chromium.org>
     2
     3        Rename ShadowRootList to ShadowTree.
     4        https://bugs.webkit.org/show_bug.cgi?id=79342
     5
     6        Reviewed by Hajime Morita.
     7
     8        This patch renames ShadowRootList ot ShadowTree.
     9
     10        No new tests, no change in behavior.
     11
     12        * CMakeLists.txt:
     13        * GNUmakefile.list.am:
     14        * Target.pri:
     15        * WebCore.exp.in:
     16        * WebCore.gypi:
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * dom/DOMAllInOne.cpp:
     19        * dom/Document.cpp:
     20        (WebCore::Document::buildAccessKeyMap):
     21        * dom/Element.cpp:
     22        (WebCore::Element::willRemove):
     23        (WebCore::Element::insertedIntoDocument):
     24        (WebCore::Element::removedFromDocument):
     25        (WebCore::Element::insertedIntoTree):
     26        (WebCore::Element::removedFromTree):
     27        (WebCore::Element::attach):
     28        (WebCore::Element::detach):
     29        (WebCore::Element::recalcStyle):
     30        (WebCore::Element::hasShadowRoot):
     31        (WebCore::Element::shadowTree):
     32        (WebCore::Element::setShadowRoot):
     33        (WebCore::Element::ensureShadowRoot):
     34        (WebCore::Element::removeShadowRoot):
     35        (WebCore::Element::childrenChanged):
     36        * dom/Element.h:
     37        (WebCore):
     38        (Element):
     39        * dom/ElementRareData.h:
     40        (ElementRareData):
     41        (WebCore::ElementRareData::~ElementRareData):
     42        * dom/Node.cpp:
     43        (WebCore::oldestShadowRoot):
     44        * dom/NodeRenderingContext.cpp:
     45        (WebCore::NodeRenderingContext::NodeRenderingContext):
     46        (WebCore::NodeRenderingContext::hostChildrenChanged):
     47        (WebCore::NodeRenderingContext::shouldCreateRenderer):
     48        * dom/NodeRenderingContext.h:
     49        (WebCore):
     50        * dom/ShadowRoot.cpp:
     51        (WebCore::ShadowRoot::tree):
     52        (WebCore::ShadowRoot::attach):
     53        * dom/ShadowRoot.h:
     54        (WebCore):
     55        (ShadowRoot):
     56        * dom/ShadowTree.cpp: Renamed from Source/WebCore/dom/ShadowRootList.cpp.
     57        (WebCore):
     58        (WebCore::ShadowTree::ShadowTree):
     59        (WebCore::ShadowTree::~ShadowTree):
     60        (WebCore::ShadowTree::pushShadowRoot):
     61        (WebCore::ShadowTree::popShadowRoot):
     62        (WebCore::ShadowTree::insertedIntoDocument):
     63        (WebCore::ShadowTree::removedFromDocument):
     64        (WebCore::ShadowTree::insertedIntoTree):
     65        (WebCore::ShadowTree::removedFromTree):
     66        (WebCore::ShadowTree::willRemove):
     67        (WebCore::ShadowTree::attach):
     68        (WebCore::ShadowTree::detach):
     69        (WebCore::ShadowTree::insertionPointFor):
     70        (WebCore::ShadowTree::isSelectorActive):
     71        (WebCore::ShadowTree::reattach):
     72        (WebCore::ShadowTree::childNeedsStyleRecalc):
     73        (WebCore::ShadowTree::needsStyleRecalc):
     74        (WebCore::ShadowTree::recalcShadowTreeStyle):
     75        (WebCore::ShadowTree::needsReattachHostChildrenAndShadow):
     76        (WebCore::ShadowTree::hostChildrenChanged):
     77        (WebCore::ShadowTree::setNeedsReattachHostChildrenAndShadow):
     78        (WebCore::ShadowTree::reattachHostChildrenAndShadow):
     79        (WebCore::ShadowTree::ensureSelector):
     80        * dom/ShadowTree.h: Renamed from Source/WebCore/dom/ShadowRootList.h.
     81        (WebCore):
     82        (ShadowTree):
     83        (WebCore::ShadowTree::hasShadowRoot):
     84        (WebCore::ShadowTree::youngestShadowRoot):
     85        (WebCore::ShadowTree::oldestShadowRoot):
     86        (WebCore::ShadowTree::selector):
     87        (WebCore::ShadowTree::clearNeedsReattachHostChildrenAndShadow):
     88        (WebCore::ShadowTree::host):
     89        * dom/TreeScopeAdopter.cpp:
     90        (WebCore::shadowRootFor):
     91        * html/ColorInputType.cpp:
     92        (WebCore::ColorInputType::createShadowSubtree):
     93        (WebCore::ColorInputType::shadowColorSwatch):
     94        * html/FileInputType.cpp:
     95        (WebCore::FileInputType::createShadowSubtree):
     96        (WebCore::FileInputType::multipleAttributeChanged):
     97        * html/HTMLDetailsElement.cpp:
     98        (WebCore::HTMLDetailsElement::findMainSummary):
     99        * html/HTMLKeygenElement.cpp:
     100        (WebCore::HTMLKeygenElement::shadowSelect):
     101        * html/HTMLMediaElement.cpp:
     102        (WebCore::HTMLMediaElement::mediaControls):
     103        (WebCore::HTMLMediaElement::hasMediaControls):
     104        * html/HTMLSummaryElement.cpp:
     105        * html/HTMLTextAreaElement.cpp:
     106        (WebCore::HTMLTextAreaElement::innerTextElement):
     107        (WebCore::HTMLTextAreaElement::updatePlaceholderText):
     108        * html/InputType.cpp:
     109        (WebCore::InputType::destroyShadowSubtree):
     110        * html/RangeInputType.cpp:
     111        (WebCore::RangeInputType::handleMouseDownEvent):
     112        (WebCore::RangeInputType::createShadowSubtree):
     113        * html/TextFieldInputType.cpp:
     114        (WebCore::TextFieldInputType::createShadowSubtree):
     115        (WebCore::TextFieldInputType::updatePlaceholderText):
     116        * html/ValidationMessage.cpp:
     117        (WebCore::ValidationMessage::deleteBubbleTree):
     118        * html/shadow/HTMLContentElement.cpp:
     119        (WebCore::HTMLContentElement::attach):
     120        (WebCore::HTMLContentElement::detach):
     121        (WebCore::HTMLContentElement::parseAttribute):
     122        * html/shadow/SliderThumbElement.cpp:
     123        (WebCore::sliderThumbElementOf):
     124        (WebCore::RenderSliderContainer::layout):
     125        (WebCore::trackLimiterElementOf):
     126        * page/FocusController.cpp:
     127        (WebCore::shadowRoot):
     128        * rendering/RenderFileUploadControl.cpp:
     129        (WebCore::RenderFileUploadControl::uploadButton):
     130        * svg/SVGTRefElement.cpp:
     131        (WebCore::SVGTRefElement::updateReferencedText):
     132        (WebCore::SVGTRefElement::detachTarget):
     133        * testing/Internals.cpp:
     134        (WebCore::Internals::ensureShadowRoot):
     135        (WebCore::Internals::youngestShadowRoot):
     136        (WebCore::Internals::oldestShadowRoot):
     137
    11382012-02-26  Adam Barth  <abarth@webkit.org>
    2139
  • trunk/Source/WebCore/GNUmakefile.list.am

    r108958 r108959  
    17391739        Source/WebCore/dom/ShadowRoot.cpp \
    17401740        Source/WebCore/dom/ShadowRoot.h \
    1741         Source/WebCore/dom/ShadowRootList.cpp \
    1742         Source/WebCore/dom/ShadowRootList.h \
     1741        Source/WebCore/dom/ShadowTree.cpp \
     1742        Source/WebCore/dom/ShadowTree.h \
    17431743        Source/WebCore/dom/SpaceSplitString.cpp \
    17441744        Source/WebCore/dom/SpaceSplitString.h \
  • trunk/Source/WebCore/Target.pri

    r108958 r108959  
    572572    dom/SelectorQuery.cpp \
    573573    dom/ShadowRoot.cpp \
    574     dom/ShadowRootList.cpp \
     574    dom/ShadowTree.cpp \
    575575    dom/SpaceSplitString.cpp \
    576576    dom/StaticNodeList.cpp \
     
    16911691    dom/SelectorQuery.h \
    16921692    dom/ShadowRoot.h \
    1693     dom/ShadowRootList.h \
     1693    dom/ShadowTree.h \
    16941694    dom/SpaceSplitString.h \
    16951695    dom/StaticNodeList.h \
  • trunk/Source/WebCore/WebCore.exp.in

    r108957 r108959  
    14481448__ZNK7WebCore6Widget9frameRectEv
    14491449__ZNK7WebCore7Element10screenRectEv
     1450__ZNK7WebCore7Element10shadowTreeEv
    14501451__ZNK7WebCore7Element12getAttributeERKNS_13QualifiedNameE
    14511452__ZNK7WebCore7Element13hasShadowRootEv
    1452 __ZNK7WebCore7Element14shadowRootListEv
    14531453__ZNK7WebCore7IntRect10intersectsERKS0_
    14541454__ZNK7WebCore7IntRect8containsERKS0_
  • trunk/Source/WebCore/WebCore.gypi

    r108958 r108959  
    620620            'dom/ScriptRunner.h',
    621621            'dom/ShadowRoot.h',
    622             'dom/ShadowRootList.h',
     622            'dom/ShadowTree.h',
    623623            'dom/SpaceSplitString.h',
    624624            'dom/StyledElement.h',
     
    51515151            'dom/ShadowRoot.cpp',
    51525152            'dom/ShadowRoot.h',
    5153             'dom/ShadowRootList.cpp',
    5154             'dom/ShadowRootList.h',
     5153            'dom/ShadowTree.cpp',
     5154            'dom/ShadowTree.h',
    51555155            'dom/SpaceSplitString.cpp',
    51565156            'dom/StaticHashSetNodeList.cpp',
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r108958 r108959  
    15941594                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
    15951595                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1596                 572E92FB14E540580087FFBA /* ShadowRootList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 572E92F914E540580087FFBA /* ShadowRootList.cpp */; };
    1597                 572E92FC14E540580087FFBA /* ShadowRootList.h in Headers */ = {isa = PBXBuildFile; fileRef = 572E92FA14E540580087FFBA /* ShadowRootList.h */; };
    15981596                573D134714CE39FF0057ABCA /* InspectorTypeBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorTypeBuilder.cpp */; };
    15991597                57B791A314C6A62900F202D1 /* HTMLContentSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* HTMLContentSelector.cpp */; };
     
    16051603                57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; };
    16061604                57CF497514EE36D700ECFF14 /* InsertionPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 57CF497314EE36D700ECFF14 /* InsertionPoint.h */; };
     1605                57CF4C8614F7597A00ECFF14 /* ShadowTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */; };
     1606                57CF4C8714F7597A00ECFF14 /* ShadowTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 57CF4C8514F7597A00ECFF14 /* ShadowTree.h */; };
    16071607                5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; };
    16081608                5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; };
     
    84818481                550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    84828482                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    8483                 572E92F914E540580087FFBA /* ShadowRootList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShadowRootList.cpp; path = ../../dom/ShadowRootList.cpp; sourceTree = "<group>"; };
    8484                 572E92FA14E540580087FFBA /* ShadowRootList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShadowRootList.h; path = ../../dom/ShadowRootList.h; sourceTree = "<group>"; };
    84858483                573D134514CE39FF0057ABCA /* InspectorTypeBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTypeBuilder.cpp; sourceTree = "<group>"; };
    84868484                573D134614CE39FF0057ABCA /* InspectorTypeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTypeBuilder.h; sourceTree = "<group>"; };
     
    84938491                57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; };
    84948492                57CF497314EE36D700ECFF14 /* InsertionPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InsertionPoint.h; sourceTree = "<group>"; };
     8493                57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowTree.cpp; sourceTree = "<group>"; };
     8494                57CF4C8514F7597A00ECFF14 /* ShadowTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowTree.h; sourceTree = "<group>"; };
    84958495                5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTreeViewer.cpp; sourceTree = "<group>"; };
    84968496                5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = "<group>"; };
     
    1446414464                                A715E650134BBBEC00D8E713 /* ProgressShadowElement.cpp */,
    1446514465                                A715E651134BBBEC00D8E713 /* ProgressShadowElement.h */,
    14466                                 572E92F914E540580087FFBA /* ShadowRootList.cpp */,
    14467                                 572E92FA14E540580087FFBA /* ShadowRootList.h */,
    1446814466                                4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */,
    1446914467                                4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */,
     
    2086320861                                A6D169631346B4C1000EB770 /* ShadowRoot.h */,
    2086420862                                A7DB418114CE1F0A00A2E316 /* ShadowRoot.idl */,
     20863                                57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */,
     20864                                57CF4C8514F7597A00ECFF14 /* ShadowTree.h */,
    2086520865                                D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */,
    2086620866                                D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */,
     
    2375123751                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
    2375223752                                A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
    23753                                 572E92FC14E540580087FFBA /* ShadowRootList.h in Headers */,
     23753                                57CF4C8714F7597A00ECFF14 /* ShadowTree.h in Headers */,
    2375423754                                A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */,
    2375523755                                B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */,
     
    2682726827                                BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
    2682826828                                A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
    26829                                 572E92FB14E540580087FFBA /* ShadowRootList.cpp in Sources */,
     26829                                57CF4C8614F7597A00ECFF14 /* ShadowTree.cpp in Sources */,
    2683026830                                A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */,
    2683126831                                B2AFFC930D00A5DF0030074D /* ShapeArabic.c in Sources */,
  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r108954 r108959  
    119119#include "SelectorQuery.cpp"
    120120#include "ShadowRoot.cpp"
    121 #include "ShadowRootList.cpp"
     121#include "ShadowTree.cpp"
    122122#include "SpaceSplitString.cpp"
    123123#include "StaticHashSetNodeList.cpp"
  • trunk/Source/WebCore/dom/Document.cpp

    r108832 r108959  
    142142#include "Settings.h"
    143143#include "ShadowRoot.h"
    144 #include "ShadowRootList.h"
     144#include "ShadowTree.h"
    145145#include "StaticHashSetNodeList.h"
    146146#include "StyleSheetList.h"
     
    674674
    675675        if (element->hasShadowRoot()) {
    676             for (ShadowRoot* root = element->shadowRootList()->youngestShadowRoot(); root; root = root->olderShadowRoot())
     676            for (ShadowRoot* root = element->shadowTree()->youngestShadowRoot(); root; root = root->olderShadowRoot())
    677677                buildAccessKeyMap(root);
    678678        }
  • trunk/Source/WebCore/dom/Element.cpp

    r108758 r108959  
    848848        setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
    849849#endif
    850     if (ShadowRootList* shadowRoots = shadowRootList())
    851         shadowRoots->willRemove();
     850    if (ShadowTree* tree = shadowTree())
     851        tree->willRemove();
    852852    ContainerNode::willRemove();
    853853}
     
    858858    // by the time we reach updateId
    859859    ContainerNode::insertedIntoDocument();
    860     if (ShadowRootList* shadowRoots = shadowRootList())
    861         shadowRoots->insertedIntoDocument();
     860    if (ShadowTree* tree = shadowTree())
     861        tree->insertedIntoDocument();
    862862
    863863    if (m_attributeMap) {
     
    891891
    892892    ContainerNode::removedFromDocument();
    893     if (ShadowRootList* shadowRoots = shadowRootList())
    894         shadowRoots->removedFromDocument();
     893    if (ShadowTree* tree = shadowTree())
     894        tree->removedFromDocument();
    895895}
    896896
     
    900900    if (!deep)
    901901        return;
    902     if (ShadowRootList* shadowRoots = shadowRootList())
    903         shadowRoots->insertedIntoTree(true);
     902    if (ShadowTree* tree = shadowTree())
     903        tree->insertedIntoTree(true);
    904904
    905905#if ENABLE(FULLSCREEN_API)
     
    914914    if (!deep)
    915915        return;
    916     if (ShadowRootList* shadowRoots = shadowRootList())
    917         shadowRoots->removedFromTree(true);
     916    if (ShadowTree* tree = shadowTree())
     917        tree->removedFromTree(true);
    918918}
    919919
     
    929929    if (hasShadowRoot()) {
    930930        parentPusher.push();
    931         shadowRootList()->attach();
     931        shadowTree()->attach();
    932932
    933933        // In a shadow tree, some of light children may be attached by 'content' element.
     
    966966        rareData()->resetComputedStyle();
    967967    ContainerNode::detach();
    968     if (ShadowRootList* shadowRoots = shadowRootList())
    969         shadowRoots->detach();
     968    if (ShadowTree* tree = shadowTree())
     969        tree->detach();
    970970
    971971    RenderWidget::resumeWidgetHierarchyUpdates();
     
    11271127    // FIXME: This does not care about sibling combinators. Will be necessary in XBL2 world.
    11281128    if (hasShadowRoot()) {
    1129         ShadowRootList* list = shadowRootList();
    1130         if (change >= Inherit || list->childNeedsStyleRecalc() || list->needsStyleRecalc()) {
     1129        ShadowTree* tree = shadowTree();
     1130        if (change >= Inherit || tree->childNeedsStyleRecalc() || tree->needsStyleRecalc()) {
    11311131            parentPusher.push();
    1132             list->recalcShadowTreeStyle(change);
     1132            tree->recalcShadowTreeStyle(change);
    11331133        }
    11341134    }
     
    11431143bool Element::hasShadowRoot() const
    11441144{
    1145     if (ShadowRootList* list = shadowRootList())
    1146         return list->hasShadowRoot();
     1145    if (ShadowTree* tree = shadowTree())
     1146        return tree->hasShadowRoot();
    11471147    return false;
    11481148}
    11491149
    1150 ShadowRootList* Element::shadowRootList() const
     1150ShadowTree* Element::shadowTree() const
    11511151{
    11521152    if (!hasRareData())
    11531153        return 0;
    11541154
    1155     return &rareData()->m_shadowRootList;
     1155    return &rareData()->m_shadowTree;
    11561156}
    11571157
     
    11851185
    11861186    shadowRoot->setShadowHost(this);
    1187     shadowRootList()->pushShadowRoot(shadowRoot.get());
     1187    shadowTree()->pushShadowRoot(shadowRoot.get());
    11881188
    11891189    if (inDocument())
     
    11991199{
    12001200    if (hasShadowRoot())
    1201         return shadowRootList()->oldestShadowRoot();
     1201        return shadowTree()->oldestShadowRoot();
    12021202
    12031203    return ShadowRoot::create(this, ShadowRoot::CreatingUserAgentShadowRoot).get();
     
    12091209        return;
    12101210
    1211     while (RefPtr<ShadowRoot> oldRoot = shadowRootList()->popShadowRoot()) {
     1211    while (RefPtr<ShadowRoot> oldRoot = shadowTree()->popShadowRoot()) {
    12121212        document()->removeFocusedNodeOfSubtree(oldRoot.get());
    12131213
     
    13621362    if (hasRareData()) {
    13631363        if (hasShadowRoot())
    1364             shadowRootList()->hostChildrenChanged();
     1364            shadowTree()->hostChildrenChanged();
    13651365    }
    13661366}
  • trunk/Source/WebCore/dom/Element.h

    r108758 r108959  
    4343class IntSize;
    4444class ShadowRoot;
    45 class ShadowRootList;
     45class ShadowTree;
    4646class WebKitAnimationList;
    4747
     
    255255
    256256    bool hasShadowRoot() const;
    257     ShadowRootList* shadowRootList() const;
    258 
    259     // FIXME: These API will be moved to ShadowRootList.
     257    ShadowTree* shadowTree() const;
     258
     259    // FIXME: These API will be moved to ShadowTree.
    260260    // https://bugs.webkit.org/show_bug.cgi?id=78313
    261261    void setShadowRoot(PassRefPtr<ShadowRoot>, ExceptionCode&);
  • trunk/Source/WebCore/dom/ElementRareData.h

    r107793 r108959  
    2828#include "HTMLCollection.h"
    2929#include "NodeRareData.h"
    30 #include "ShadowRootList.h"
     30#include "ShadowTree.h"
    3131#include <wtf/OwnPtr.h>
    3232
     
    6565    LayoutSize m_minimumSizeForResizing;
    6666    RefPtr<RenderStyle> m_computedStyle;
    67     ShadowRootList m_shadowRootList;
     67    ShadowTree m_shadowTree;
    6868    AtomicString m_shadowPseudoId;
    6969
     
    9595inline ElementRareData::~ElementRareData()
    9696{
    97     ASSERT(!m_shadowRootList.hasShadowRoot());
     97    ASSERT(!m_shadowTree.hasShadowRoot());
    9898}
    9999
  • trunk/Source/WebCore/dom/Node.cpp

    r108770 r108959  
    8787#include "SelectorQuery.h"
    8888#include "ShadowRoot.h"
    89 #include "ShadowRootList.h"
     89#include "ShadowTree.h"
    9090#include "StaticNodeList.h"
    9191#include "StorageEvent.h"
     
    812812inline static ShadowRoot* oldestShadowRootFor(const Node* node)
    813813{
    814     return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowRootList()->oldestShadowRoot() : 0;
     814    return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->oldestShadowRoot() : 0;
    815815}
    816816
  • trunk/Source/WebCore/dom/NodeRenderingContext.cpp

    r108758 r108959  
    3636#include "RenderView.h"
    3737#include "ShadowRoot.h"
    38 #include "ShadowRootList.h"
     38#include "ShadowTree.h"
    3939
    4040#if ENABLE(SVG)
     
    4848    , m_node(node)
    4949    , m_parentNodeForRenderingAndStyle(0)
    50     , m_visualParentShadowRootList(0)
     50    , m_visualParentShadowTree(0)
    5151    , m_insertionPoint(0)
    5252    , m_style(0)
     
    6565    if (parent->isElementNode()) {
    6666        if (toElement(parent)->hasShadowRoot()) {
    67             m_visualParentShadowRootList = toElement(parent)->shadowRootList();
    68             if ((m_insertionPoint = m_visualParentShadowRootList->insertionPointFor(m_node))
    69                 && m_visualParentShadowRootList->isSelectorActive()) {
     67            m_visualParentShadowTree = toElement(parent)->shadowTree();
     68            if ((m_insertionPoint = m_visualParentShadowTree->insertionPointFor(m_node))
     69                && m_visualParentShadowTree->isSelectorActive()) {
    7070                m_phase = AttachingDistributed;
    7171                m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_insertionPoint).parentNodeForRenderingAndStyle();
     
    9696    , m_node(node)
    9797    , m_parentNodeForRenderingAndStyle(0)
    98     , m_visualParentShadowRootList(0)
     98    , m_visualParentShadowTree(0)
    9999    , m_insertionPoint(0)
    100100    , m_style(style)
     
    262262{
    263263    if (m_phase == AttachingNotDistributed)
    264         m_visualParentShadowRootList->hostChildrenChanged();
     264        m_visualParentShadowTree->hostChildrenChanged();
    265265}
    266266
  • trunk/Source/WebCore/dom/NodeRenderingContext.h

    r108758 r108959  
    4040class RenderObject;
    4141class RenderStyle;
    42 class ShadowRootList;
     42class ShadowTree;
    4343
    4444class NodeRenderingContext {
     
    8383    Node* m_node;
    8484    ContainerNode* m_parentNodeForRenderingAndStyle;
    85     ShadowRootList* m_visualParentShadowRootList;
     85    ShadowTree* m_visualParentShadowTree;
    8686    InsertionPoint* m_insertionPoint;
    8787    RefPtr<RenderStyle> m_style;
  • trunk/Source/WebCore/dom/ShadowRoot.cpp

    r108713 r108959  
    3535#include "InsertionPoint.h"
    3636#include "NodeRareData.h"
    37 #include "ShadowRootList.h"
     37#include "ShadowTree.h"
    3838#include "SVGNames.h"
    3939
     
    158158}
    159159
    160 ShadowRootList* ShadowRoot::list() const
     160ShadowTree* ShadowRoot::tree() const
    161161{
    162162    if (host())
    163         return host()->shadowRootList();
     163        return host()->shadowTree();
    164164    return 0;
    165165}
     
    191191    // it is in clean state.
    192192    // FIXME: This assertion breaks if multiple shadow roots are being attached.
    193     // ShadowRootList should have responsibility of side effect of selector in attaching/detaching.
    194     ASSERT(!host()->shadowRootList()->selector() || !host()->shadowRootList()->selector()->hasCandidates());
     193    // ShadowTree should have responsibility of side effect of selector in attaching/detaching.
     194    ASSERT(!tree()->selector() || !tree()->selector()->hasCandidates());
    195195    DocumentFragment::attach();
    196     if (HTMLContentSelector* selector = host()->shadowRootList()->selector())
     196    if (HTMLContentSelector* selector = tree()->selector())
    197197        selector->didSelect();
    198198}
  • trunk/Source/WebCore/dom/ShadowRoot.h

    r108770 r108959  
    3939class HTMLContentSelector;
    4040class InsertionPoint;
    41 class ShadowRootList;
     41class ShadowTree;
    4242
    4343class ShadowRoot : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> {
     
    7171
    7272    Element* host() const { return shadowHost(); }
    73     ShadowRootList* list() const;
     73    ShadowTree* tree() const;
    7474
    7575    ShadowRoot* youngerShadowRoot() const { return prev(); }
  • trunk/Source/WebCore/dom/ShadowTree.cpp

    r108958 r108959  
    2626
    2727#include "config.h"
    28 #include "ShadowRootList.h"
     28#include "ShadowTree.h"
    2929
    3030#include "Document.h"
     
    3737namespace WebCore {
    3838
    39 ShadowRootList::ShadowRootList()
     39ShadowTree::ShadowTree()
    4040    : m_needsRecalculateContent(false)
    4141{
    4242}
    4343
    44 ShadowRootList::~ShadowRootList()
     44ShadowTree::~ShadowTree()
    4545{
    4646    ASSERT(!hasShadowRoot());
    4747}
    4848
    49 void ShadowRootList::pushShadowRoot(ShadowRoot* shadowRoot)
     49void ShadowTree::pushShadowRoot(ShadowRoot* shadowRoot)
    5050{
    5151#if ENABLE(SHADOW_DOM)
     
    5959}
    6060
    61 ShadowRoot* ShadowRootList::popShadowRoot()
     61ShadowRoot* ShadowTree::popShadowRoot()
    6262{
    6363    if (!hasShadowRoot())
     
    6767}
    6868
    69 void ShadowRootList::insertedIntoDocument()
     69void ShadowTree::insertedIntoDocument()
    7070{
    7171    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
     
    7373}
    7474
    75 void ShadowRootList::removedFromDocument()
     75void ShadowTree::removedFromDocument()
    7676{
    7777    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
     
    7979}
    8080
    81 void ShadowRootList::insertedIntoTree(bool deep)
     81void ShadowTree::insertedIntoTree(bool deep)
    8282{
    8383    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
     
    8585}
    8686
    87 void ShadowRootList::removedFromTree(bool deep)
     87void ShadowTree::removedFromTree(bool deep)
    8888{
    8989    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
     
    9191}
    9292
    93 void ShadowRootList::willRemove()
     93void ShadowTree::willRemove()
    9494{
    9595    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
     
    9797}
    9898
    99 void ShadowRootList::attach()
     99void ShadowTree::attach()
    100100{
    101101    // FIXME: Currently we only support the case that the shadow root list has at most one shadow root.
     
    109109}
    110110
    111 void ShadowRootList::detach()
     111void ShadowTree::detach()
    112112{
    113113    // FIXME: Currently we only support the case that the shadow root list has at most one shadow root.
     
    121121}
    122122
    123 InsertionPoint* ShadowRootList::insertionPointFor(Node* node) const
     123InsertionPoint* ShadowTree::insertionPointFor(Node* node) const
    124124{
    125125    if (!m_selector)
     
    131131}
    132132
    133 bool ShadowRootList::isSelectorActive() const
     133bool ShadowTree::isSelectorActive() const
    134134{
    135135    return m_selector && m_selector->hasCandidates();
    136136}
    137137
    138 void ShadowRootList::reattach()
     138void ShadowTree::reattach()
    139139{
    140140    detach();
     
    142142}
    143143
    144 bool ShadowRootList::childNeedsStyleRecalc()
     144bool ShadowTree::childNeedsStyleRecalc()
    145145{
    146146    ASSERT(youngestShadowRoot());
     
    151151}
    152152
    153 bool ShadowRootList::needsStyleRecalc()
     153bool ShadowTree::needsStyleRecalc()
    154154{
    155155    ASSERT(youngestShadowRoot());
     
    160160}
    161161
    162 void ShadowRootList::recalcShadowTreeStyle(Node::StyleChange change)
     162void ShadowTree::recalcShadowTreeStyle(Node::StyleChange change)
    163163{
    164164    ShadowRoot* youngest = youngestShadowRoot();
     
    184184}
    185185
    186 bool ShadowRootList::needsReattachHostChildrenAndShadow()
     186bool ShadowTree::needsReattachHostChildrenAndShadow()
    187187{
    188188    return m_needsRecalculateContent || (youngestShadowRoot() && youngestShadowRoot()->hasContentElement());
    189189}
    190190
    191 void ShadowRootList::hostChildrenChanged()
     191void ShadowTree::hostChildrenChanged()
    192192{
    193193    ASSERT(youngestShadowRoot());
     
    200200}
    201201
    202 void ShadowRootList::setNeedsReattachHostChildrenAndShadow()
     202void ShadowTree::setNeedsReattachHostChildrenAndShadow()
    203203{
    204204    m_needsRecalculateContent = true;
     
    207207}
    208208
    209 void ShadowRootList::reattachHostChildrenAndShadow()
     209void ShadowTree::reattachHostChildrenAndShadow()
    210210{
    211211    ASSERT(youngestShadowRoot());
     
    228228}
    229229
    230 HTMLContentSelector* ShadowRootList::ensureSelector()
     230HTMLContentSelector* ShadowTree::ensureSelector()
    231231{
    232232    if (!m_selector)
  • trunk/Source/WebCore/dom/ShadowTree.h

    r108958 r108959  
    2525 */
    2626
    27 #ifndef ShadowRootList_h
    28 #define ShadowRootList_h
     27#ifndef ShadowTree_h
     28#define ShadowTree_h
    2929
    3030#include "ShadowRoot.h"
     
    4141class InsertionPoint;
    4242
    43 class ShadowRootList {
     43class ShadowTree {
    4444public:
    45     ShadowRootList();
    46     ~ShadowRootList();
     45    ShadowTree();
     46    ~ShadowTree();
    4747
    4848    bool hasShadowRoot() const;
     
    8585    OwnPtr<HTMLContentSelector> m_selector;
    8686    bool m_needsRecalculateContent : 1;
    87     WTF_MAKE_NONCOPYABLE(ShadowRootList);
     87    WTF_MAKE_NONCOPYABLE(ShadowTree);
    8888};
    8989
    90 inline bool ShadowRootList::hasShadowRoot() const
     90inline bool ShadowTree::hasShadowRoot() const
    9191{
    9292    return !m_shadowRoots.isEmpty();
    9393}
    9494
    95 inline ShadowRoot* ShadowRootList::youngestShadowRoot() const
     95inline ShadowRoot* ShadowTree::youngestShadowRoot() const
    9696{
    9797    return m_shadowRoots.head();
    9898}
    9999
    100 inline ShadowRoot* ShadowRootList::oldestShadowRoot() const
     100inline ShadowRoot* ShadowTree::oldestShadowRoot() const
    101101{
    102102    return m_shadowRoots.tail();
    103103}
    104104
    105 inline HTMLContentSelector* ShadowRootList::selector() const
     105inline HTMLContentSelector* ShadowTree::selector() const
    106106{
    107107    return m_selector.get();
    108108}
    109109
    110 inline void ShadowRootList::clearNeedsReattachHostChildrenAndShadow()
     110inline void ShadowTree::clearNeedsReattachHostChildrenAndShadow()
    111111{
    112112    m_needsRecalculateContent = false;
    113113}
    114114
    115 inline Element* ShadowRootList::host() const
     115inline Element* ShadowTree::host() const
    116116{
    117117    ASSERT(hasShadowRoot());
  • trunk/Source/WebCore/dom/TreeScopeAdopter.cpp

    r107706 r108959  
    2929#include "NodeRareData.h"
    3030#include "ShadowRoot.h"
    31 #include "ShadowRootList.h"
     31#include "ShadowTree.h"
    3232
    3333namespace WebCore {
     
    3535static inline ShadowRoot* shadowRootFor(Node* node)
    3636{
    37     return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowRootList()->youngestShadowRoot() : 0;
     37    return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->youngestShadowRoot() : 0;
    3838}
    3939
  • trunk/Source/WebCore/html/ColorInputType.cpp

    r108209 r108959  
    117117    wrapperElement->appendChild(colorSwatch.release(), ec);
    118118    ASSERT(!ec);
    119     element()->shadowRootList()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);
     119    element()->shadowTree()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);
    120120    ASSERT(!ec);
    121121   
     
    186186HTMLElement* ColorInputType::shadowColorSwatch() const
    187187{
    188     ShadowRoot* shadow = element()->shadowRootList()->oldestShadowRoot();
     188    ShadowRoot* shadow = element()->shadowTree()->oldestShadowRoot();
    189189    return shadow ? toHTMLElement(shadow->firstChild()->firstChild()) : 0;
    190190}
  • trunk/Source/WebCore/html/FileInputType.cpp

    r107706 r108959  
    3737#include "ScriptController.h"
    3838#include "ShadowRoot.h"
    39 #include "ShadowRootList.h"
     39#include "ShadowTree.h"
    4040#include <wtf/PassOwnPtr.h>
    4141#include <wtf/text/StringBuilder.h>
     
    269269    ASSERT(element()->hasShadowRoot());
    270270    ExceptionCode ec = 0;
    271     element()->shadowRootList()->oldestShadowRoot()->appendChild(element()->multiple() ? UploadButtonElement::createForMultiple(element()->document()): UploadButtonElement::create(element()->document()), ec);
     271    element()->shadowTree()->oldestShadowRoot()->appendChild(element()->multiple() ? UploadButtonElement::createForMultiple(element()->document()): UploadButtonElement::create(element()->document()), ec);
    272272}
    273273
     
    275275{
    276276    ASSERT(element()->hasShadowRoot());
    277     UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadowRootList()->oldestShadowRoot()->firstChild());
     277    UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadowTree()->oldestShadowRoot()->firstChild());
    278278    if (button)
    279279        button->setValue(element()->multiple() ? fileButtonChooseMultipleFilesLabel() : fileButtonChooseFileLabel());
  • trunk/Source/WebCore/html/HTMLDetailsElement.cpp

    r108758 r108959  
    3232#include "RenderDetails.h"
    3333#include "ShadowRoot.h"
    34 #include "ShadowRootList.h"
     34#include "ShadowTree.h"
    3535#include "Text.h"
    3636
     
    125125    }
    126126
    127     return static_cast<DetailsSummaryElement*>(shadowRootList()->oldestShadowRoot()->firstChild())->fallbackSummary();
     127    return static_cast<DetailsSummaryElement*>(shadowTree()->oldestShadowRoot()->firstChild())->fallbackSummary();
    128128}
    129129
  • trunk/Source/WebCore/html/HTMLKeygenElement.cpp

    r107706 r108959  
    3434#include "SSLKeyGenerator.h"
    3535#include "ShadowRoot.h"
    36 #include "ShadowRootList.h"
     36#include "ShadowTree.h"
    3737#include "Text.h"
    3838#include <wtf/StdLibExtras.h>
     
    133133{
    134134    ASSERT(hasShadowRoot());
    135     ShadowRoot* shadow = shadowRootList()->oldestShadowRoot();
     135    ShadowRoot* shadow = shadowTree()->oldestShadowRoot();
    136136    return shadow ? toHTMLSelectElement(shadow->firstChild()) : 0;
    137137}
  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r108831 r108959  
    7474#include "Settings.h"
    7575#include "ShadowRoot.h"
    76 #include "ShadowRootList.h"
     76#include "ShadowTree.h"
    7777#include "TimeRanges.h"
    7878#include "UUID.h"
     
    37523752MediaControls* HTMLMediaElement::mediaControls()
    37533753{
    3754     return toMediaControls(shadowRootList()->oldestShadowRoot()->firstChild());
     3754    return toMediaControls(shadowTree()->oldestShadowRoot()->firstChild());
    37553755}
    37563756
     
    37603760        return false;
    37613761
    3762     Node* node = shadowRootList()->oldestShadowRoot()->firstChild();
     3762    Node* node = shadowTree()->oldestShadowRoot()->firstChild();
    37633763    return node && node->isMediaControls();
    37643764}
  • trunk/Source/WebCore/html/HTMLSummaryElement.cpp

    r108758 r108959  
    3434#include "RenderSummary.h"
    3535#include "ShadowRoot.h"
    36 #include "ShadowRootList.h"
     36#include "ShadowTree.h"
    3737
    3838namespace WebCore {
  • trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

    r108345 r108959  
    3939#include "RenderTextControlMultiLine.h"
    4040#include "ShadowRoot.h"
    41 #include "ShadowRootList.h"
     41#include "ShadowTree.h"
    4242#include "Text.h"
    4343#include "TextControlInnerElements.h"
     
    295295HTMLElement* HTMLTextAreaElement::innerTextElement() const
    296296{
    297     Node* node = shadowRootList()->oldestShadowRoot()->firstChild();
     297    Node* node = shadowTree()->oldestShadowRoot()->firstChild();
    298298    ASSERT(!node || node->hasTagName(divTag));
    299299    return toHTMLElement(node);
     
    472472    if (placeholderText.isEmpty()) {
    473473        if (m_placeholder) {
    474             shadowRootList()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec);
     474            shadowTree()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec);
    475475            ASSERT(!ec);
    476476            m_placeholder.clear();
     
    481481        m_placeholder = HTMLDivElement::create(document());
    482482        m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
    483         shadowRootList()->oldestShadowRoot()->insertBefore(m_placeholder, shadowRootList()->oldestShadowRoot()->firstChild()->nextSibling(), ec);
     483        shadowTree()->oldestShadowRoot()->insertBefore(m_placeholder, shadowTree()->oldestShadowRoot()->firstChild()->nextSibling(), ec);
    484484        ASSERT(!ec);
    485485    }
  • trunk/Source/WebCore/html/InputType.cpp

    r108051 r108959  
    5757#include "SearchInputType.h"
    5858#include "ShadowRoot.h"
    59 #include "ShadowRootList.h"
     59#include "ShadowTree.h"
    6060#include "SubmitInputType.h"
    6161#include "TelephoneInputType.h"
     
    383383        return;
    384384
    385     if (ShadowRoot* root = element()->shadowRootList()->oldestShadowRoot())
     385    if (ShadowRoot* root = element()->shadowTree()->oldestShadowRoot())
    386386        root->removeAllChildren();
    387387}
  • trunk/Source/WebCore/html/RangeInputType.cpp

    r107706 r108959  
    4343#include "RenderSlider.h"
    4444#include "ShadowRoot.h"
    45 #include "ShadowRootList.h"
     45#include "ShadowTree.h"
    4646#include "SliderThumbElement.h"
    4747#include "StepRange.h"
     
    162162        return;
    163163    ASSERT(element()->hasShadowRoot());
    164     if (targetNode != element() && !targetNode->isDescendantOf(element()->shadowRootList()->oldestShadowRoot()))
     164    if (targetNode != element() && !targetNode->isDescendantOf(element()->shadowTree()->oldestShadowRoot()))
    165165        return;
    166166    SliderThumbElement* thumb = sliderThumbElementOf(element());
     
    248248    container->appendChild(track.release(), ec);
    249249    container->appendChild(TrackLimiterElement::create(document), ec);
    250     element()->shadowRootList()->oldestShadowRoot()->appendChild(container.release(), ec);
     250    element()->shadowTree()->oldestShadowRoot()->appendChild(container.release(), ec);
    251251}
    252252
  • trunk/Source/WebCore/html/TextFieldInputType.cpp

    r108228 r108959  
    4444#include "RenderTheme.h"
    4545#include "ShadowRoot.h"
    46 #include "ShadowRootList.h"
     46#include "ShadowTree.h"
    4747#include "TextControlInnerElements.h"
    4848#include "TextEvent.h"
     
    227227    m_innerText = TextControlInnerTextElement::create(document);
    228228    if (!createsContainer) {
    229         element()->shadowRootList()->oldestShadowRoot()->appendChild(m_innerText, ec);
    230         return;
    231     }
    232 
    233     ShadowRoot* shadowRoot = element()->shadowRootList()->oldestShadowRoot();
     229        element()->shadowTree()->oldestShadowRoot()->appendChild(m_innerText, ec);
     230        return;
     231    }
     232
     233    ShadowRoot* shadowRoot = element()->shadowTree()->oldestShadowRoot();
    234234    m_container = HTMLDivElement::create(document);
    235235    m_container->setShadowPseudoId("-webkit-textfield-decoration-container");
     
    393393        m_placeholder = HTMLDivElement::create(element()->document());
    394394        m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
    395         element()->shadowRootList()->oldestShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
     395        element()->shadowTree()->oldestShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
    396396        ASSERT(!ec);
    397397    }
  • trunk/Source/WebCore/html/ValidationMessage.cpp

    r107899 r108959  
    4545#include "Settings.h"
    4646#include "ShadowRoot.h"
    47 #include "ShadowRootList.h"
     47#include "ShadowTree.h"
    4848#include "Text.h"
    4949#include <wtf/PassOwnPtr.h>
     
    188188        HTMLElement* host = toHTMLElement(m_element);
    189189        ExceptionCode ec;
    190         host->shadowRootList()->oldestShadowRoot()->removeChild(m_bubble.get(), ec);
     190        host->shadowTree()->oldestShadowRoot()->removeChild(m_bubble.get(), ec);
    191191        m_bubble = 0;
    192192    }
  • trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp

    r108713 r108959  
    3333#include "QualifiedName.h"
    3434#include "ShadowRoot.h"
    35 #include "ShadowRootList.h"
     35#include "ShadowTree.h"
    3636#include <wtf/StdLibExtras.h>
    3737
     
    7575    // Before calling StyledElement::attach, selector must be calculated.
    7676    if (root) {
    77         HTMLContentSelector* selector = root->list()->ensureSelector();
     77        HTMLContentSelector* selector = root->tree()->ensureSelector();
    7878        selector->unselect(&m_selections);
    7979        selector->select(this, &m_selections);
     
    9191{
    9292    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
    93         if (HTMLContentSelector* selector = root->list()->selector())
     93        if (HTMLContentSelector* selector = root->tree()->selector())
    9494            selector->unselect(&m_selections);
    9595
    9696        // When content element is detached, shadow tree should be recreated to re-calculate selector for
    9797        // other content elements.
    98         root->list()->setNeedsReattachHostChildrenAndShadow();
     98        root->tree()->setNeedsReattachHostChildrenAndShadow();
    9999    }
    100100
     
    123123    if (attr->name() == selectAttr) {
    124124        if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode()))
    125             root->list()->setNeedsReattachHostChildrenAndShadow();
     125            root->tree()->setNeedsReattachHostChildrenAndShadow();
    126126    } else
    127127        InsertionPoint::parseAttribute(attr);
  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r107899 r108959  
    4444#include "RenderTheme.h"
    4545#include "ShadowRoot.h"
    46 #include "ShadowRootList.h"
     46#include "ShadowTree.h"
    4747#include "StepRange.h"
    4848#include <wtf/MathExtras.h>
     
    6868{
    6969    ASSERT(node);
    70     ShadowRoot* shadow = node->toInputElement()->shadowRootList()->oldestShadowRoot();
     70    ShadowRoot* shadow = node->toInputElement()->shadowTree()->oldestShadowRoot();
    7171    ASSERT(shadow);
    7272    Node* thumb = shadow->firstChild()->firstChild()->firstChild();
     
    143143    RenderObject* trackRenderer = node()->firstChild()->renderer();
    144144    if (!isVertical && input->renderer()->isSlider() && !inputHeight.isFixed() && !inputHeight.isPercent()) {
    145         RenderObject* thumbRenderer = input->shadowRootList()->oldestShadowRoot()->firstChild()->firstChild()->firstChild()->renderer();
     145        RenderObject* thumbRenderer = input->shadowTree()->oldestShadowRoot()->firstChild()->firstChild()->firstChild()->renderer();
    146146        if (thumbRenderer) {
    147147            style()->setHeight(thumbRenderer->style()->height());
     
    357357    ASSERT(node);
    358358    ASSERT(node->toInputElement()->hasShadowRoot());
    359     ShadowRoot* shadow = node->toInputElement()->shadowRootList()->oldestShadowRoot();
     359    ShadowRoot* shadow = node->toInputElement()->shadowTree()->oldestShadowRoot();
    360360    ASSERT(shadow);
    361361    Node* limiter = shadow->firstChild()->lastChild();
  • trunk/Source/WebCore/page/FocusController.cpp

    r107706 r108959  
    5555#include "Settings.h"
    5656#include "ShadowRoot.h"
    57 #include "ShadowRootList.h"
     57#include "ShadowTree.h"
    5858#include "SpatialNavigation.h"
    5959#include "Widget.h"
     
    156156static inline ShadowRoot* shadowRoot(Node* node)
    157157{
    158     return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowRootList()->youngestShadowRoot() : 0;
     158    return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->youngestShadowRoot() : 0;
    159159}
    160160
  • trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

    r108261 r108959  
    3333#include "RenderTheme.h"
    3434#include "ShadowRoot.h"
    35 #include "ShadowRootList.h"
     35#include "ShadowTree.h"
    3636#include "TextRun.h"
    3737#include "VisiblePosition.h"
     
    221221    ASSERT(input->hasShadowRoot());
    222222
    223     Node* buttonNode = input->shadowRootList()->oldestShadowRoot()->firstChild();
     223    Node* buttonNode = input->shadowTree()->oldestShadowRoot()->firstChild();
    224224    return buttonNode && buttonNode->isHTMLElement() && buttonNode->hasTagName(inputTag) ? static_cast<HTMLInputElement*>(buttonNode) : 0;
    225225}
  • trunk/Source/WebCore/svg/SVGTRefElement.cpp

    r108758 r108959  
    3333#include "RenderSVGResource.h"
    3434#include "ShadowRoot.h"
    35 #include "ShadowRootList.h"
     35#include "ShadowTree.h"
    3636#include "SVGDocument.h"
    3737#include "SVGElementInstance.h"
     
    166166
    167167    ASSERT(hasShadowRoot());
    168     ShadowRoot* root = shadowRootList()->oldestShadowRoot();
     168    ShadowRoot* root = shadowTree()->oldestShadowRoot();
    169169    if (!root->firstChild())
    170170        root->appendChild(SVGShadowText::create(document(), textContent), ASSERT_NO_EXCEPTION);
     
    182182
    183183    ASSERT(hasShadowRoot());
    184     Node* container = shadowRootList()->oldestShadowRoot()->firstChild();
     184    Node* container = shadowTree()->oldestShadowRoot()->firstChild();
    185185    if (container)
    186186        container->setTextContent(emptyContent, ignore);
  • trunk/Source/WebCore/testing/Internals.cpp

    r108831 r108959  
    5151#include "Settings.h"
    5252#include "ShadowRoot.h"
    53 #include "ShadowRootList.h"
     53#include "ShadowTree.h"
    5454#include "SpellChecker.h"
    5555#include "TextIterator.h"
     
    204204
    205205    if (host->hasShadowRoot())
    206         return host->shadowRootList()->youngestShadowRoot();
     206        return host->shadowTree()->youngestShadowRoot();
    207207
    208208    return ShadowRoot::create(host, ec).get();
     
    226226        return 0;
    227227
    228     return host->shadowRootList()->youngestShadowRoot();
     228    return host->shadowTree()->youngestShadowRoot();
    229229}
    230230
     
    239239        return 0;
    240240
    241     return host->shadowRootList()->oldestShadowRoot();
     241    return host->shadowTree()->oldestShadowRoot();
    242242}
    243243
  • trunk/Source/WebKit2/ChangeLog

    r108957 r108959  
     12012-02-26  Shinya Kawanaka  <shinyak@chromium.org>
     2
     3        Rename ShadowRootList to ShadowTree.
     4        https://bugs.webkit.org/show_bug.cgi?id=79342
     5
     6        Reviewed by Hajime Morita.
     7
     8        * win/WebKit2.def:
     9        * win/WebKit2CFLite.def:
     10
    1112012-02-26  Hajime Morrita  <morrita@chromium.org>
    212
  • trunk/Source/WebKit2/win/WebKit2.def

    r108428 r108959  
    191191        ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
    192192        ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
    193         ?shadowRootList@Element@WebCore@@QBEPAVShadowRootList@2@XZ
     193        ?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ
    194194        ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ
    195195        ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
  • trunk/Source/WebKit2/win/WebKit2CFLite.def

    r108642 r108959  
    184184        ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
    185185        ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
    186         ?shadowRootList@Element@WebCore@@QBEPAVShadowRootList@2@XZ
     186        ?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ
    187187        ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ
    188188        ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
  • trunk/Source/autotools/symbols.filter

    r108428 r108959  
    8080_ZNK7WebCore5Frame8settingsEv;
    8181_ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
     82_ZNK7WebCore7Element10shadowTreeEv;
    8283_ZNK7WebCore7Element13hasShadowRootEv;
    83 _ZNK7WebCore7Element14shadowRootListEv;
    8484_ZNK7WebCore8Document4pageEv;
    8585_ZNK7WebCore8Document8settingsEv;
Note: See TracChangeset for help on using the changeset viewer.