Changeset 116277 in webkit


Ignore:
Timestamp:
May 6, 2012 11:05:42 PM (12 years ago)
Author:
morrita@google.com
Message:

​https://bugs.webkit.org/show_bug.cgi?id=85265
[Shadow DOM] ShadowTree needs a better name

Reviewed by Dimitri Glazkov.

.:

  • Source/autotools/symbols.filter: Updated exported symbol names according to the rename.

Source/WebCore:

Renamed ShadowTree to ElementShadow, The ElementShadow class is
going to be a facade of Shadow related APIs.

Following renames follow:

  • Element::shadowTree() to Element::shadow()
  • ShadowRoot::tree() to ShadowRoot::owner()
  • ShadowTree::recalcShadowTreeStyle() to ElementShadow::recalcStyle()

No new tests. Just renames.

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

(WebCore::shadowFor):
(WebCore::shadowOfParent):
(WebCore::ComposedShadowTreeWalker::traverseChild):
(WebCore::ComposedShadowTreeWalker::traverseSiblingOrBackToInsertionPoint):
(WebCore::ComposedShadowTreeWalker::traverseParent):

  • dom/ContainerNodeAlgorithms.cpp:

(WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoDocument):
(WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoTree):
(WebCore::ChildNodeRemovalNotifier::notifyDescendantRemovedFromDocument):
(WebCore::ChildNodeRemovalNotifier::notifyDescendantRemovedFromTree):

  • dom/DOMAllInOne.cpp:
  • dom/Document.cpp:

(WebCore::Document::buildAccessKeyMap):

  • dom/Element.cpp:

(WebCore::Element::~Element):
(WebCore::Element::willRemove):
(WebCore::Element::attach):
(WebCore::Element::detach):
(WebCore::Element::recalcStyle):
(WebCore::Element::hasShadowRoot):
(WebCore::Element::shadow):
(WebCore::Element::ensureShadow):
(WebCore::Element::ensureShadowRoot):
(WebCore::Element::childrenChanged):

  • dom/Element.h:

(WebCore):
(Element):

  • dom/ElementRareData.h:

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

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

(WebCore):
(WebCore::ElementShadow::ElementShadow):
(WebCore::ElementShadow::~ElementShadow):
(WebCore::validateShadowRoot):
(WebCore::ElementShadow::addShadowRoot):
(WebCore::ElementShadow::removeAllShadowRoots):
(WebCore::ElementShadow::willRemove):
(WebCore::ElementShadow::setParentTreeScope):
(WebCore::ElementShadow::attach):
(WebCore::ElementShadow::attachHost):
(WebCore::ElementShadow::detach):
(WebCore::ElementShadow::detachHost):
(WebCore::ElementShadow::insertionPointFor):
(WebCore::ElementShadow::selectionFor):
(WebCore::ElementShadow::reattach):
(WebCore::ElementShadow::childNeedsStyleRecalc):
(WebCore::ElementShadow::needsStyleRecalc):
(WebCore::ElementShadow::recalcStyle):
(WebCore::ElementShadow::needsReattachHostChildrenAndShadow):
(WebCore::ElementShadow::hostChildrenChanged):
(WebCore::ElementShadow::setNeedsReattachHostChildrenAndShadow):
(WebCore::ElementShadow::reattachHostChildrenAndShadow):

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

(WebCore):
(ElementShadow):
(WebCore::ElementShadow::hasShadowRoot):
(WebCore::ElementShadow::youngestShadowRoot):
(WebCore::ElementShadow::oldestShadowRoot):
(WebCore::ElementShadow::selector):
(WebCore::ElementShadow::clearNeedsReattachHostChildrenAndShadow):
(WebCore::ElementShadow::host):
(ShadowRootVector):
(WebCore::ShadowRootVector::ShadowRootVector):

  • dom/Node.cpp:

(WebCore::oldestShadowRootFor):

  • dom/NodeRenderingContext.cpp:

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

  • dom/NodeRenderingContext.h:

(WebCore):

  • dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::create):
(WebCore::ShadowRoot::owner):

  • dom/ShadowRoot.h:

(WebCore):
(ShadowRoot):

  • dom/TreeScopeAdopter.cpp:

(WebCore::shadowFor):
(WebCore::TreeScopeAdopter::moveTreeToNewScope):
(WebCore::TreeScopeAdopter::moveTreeToNewDocument):
(WebCore::TreeScopeAdopter::moveShadowToNewDocument):

  • dom/TreeScopeAdopter.h:

(TreeScopeAdopter):

  • 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::parseAttribute):

  • html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::attach):
(WebCore::InsertionPoint::detach):
(WebCore::InsertionPoint::distributeHostChildren):
(WebCore::InsertionPoint::clearDistribution):

  • html/shadow/InsertionPoint.h:
  • html/shadow/SliderThumbElement.cpp:

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

  • html/shadow/TextFieldDecorationElement.cpp:

(WebCore::getDecorationRootAndDecoratedRoot):

  • inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::unbind):
(WebCore::InspectorDOMAgent::buildObjectForNode):

  • page/FocusController.cpp:

(WebCore::FocusScope::focusScopeOf):
(WebCore::FocusScope::focusScopeOwnedByShadowHost):

  • rendering/RenderFileUploadControl.cpp:

(WebCore::RenderFileUploadControl::uploadButton):

  • svg/SVGTRefElement.cpp:

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

  • svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::clearResourceReferences):
(WebCore::SVGUseElement::buildShadowAndInstanceTree):
(WebCore::SVGUseElement::buildShadowTree):

  • testing/Internals.cpp:

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

Source/WebKit2:

  • win/WebKit2.def: Updated exported symbol names according to the rename.
  • win/WebKit2CFLite.def: Updated exported symbol names according to the rename.
Location:
trunk
Files:
48 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r116257 r116277  
     12012-05-06  MORITA Hajime  <morrita@google.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=85265
     4        [Shadow DOM] ShadowTree needs a better name
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        * Source/autotools/symbols.filter: Updated exported symbol names according to the rename.
     9
    1102012-05-06  Dan Bernstein  <mitz@apple.com>
    211

  • trunk/Source/WebCore/CMakeLists.txt

    r115943 r116277  
    575575    dom/EditingText.cpp
    576576    dom/Element.cpp
     577    dom/ElementShadow.cpp
    577578    dom/ElementAttributeData.cpp
    578579    dom/EntityReference.cpp
    … …  
    630631    dom/SelectorQuery.cpp
    631632    dom/ShadowRoot.cpp
    632     dom/ShadowTree.cpp
    633633    dom/SpaceSplitString.cpp
    634634    dom/StaticHashSetNodeList.cpp

  • trunk/Source/WebCore/ChangeLog

    r116276 r116277  
     12012-05-06  MORITA Hajime  <morrita@google.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=85265
     4        [Shadow DOM] ShadowTree needs a better name
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Renamed ShadowTree to ElementShadow, The ElementShadow class is
     9        going to be a facade of Shadow related APIs.
     10
     11        Following renames follow:
     12        - Element::shadowTree() to Element::shadow()
     13        - ShadowRoot::tree() to ShadowRoot::owner()
     14        - ShadowTree::recalcShadowTreeStyle() to ElementShadow::recalcStyle()
     15
     16        No new tests. Just renames.
     17
     18        * CMakeLists.txt:
     19        * GNUmakefile.list.am:
     20        * Target.pri:
     21        * WebCore.exp.in:
     22        * WebCore.gypi:
     23        * WebCore.xcodeproj/project.pbxproj:
     24        * dom/ComposedShadowTreeWalker.cpp:
     25        (WebCore::shadowFor):
     26        (WebCore::shadowOfParent):
     27        (WebCore::ComposedShadowTreeWalker::traverseChild):
     28        (WebCore::ComposedShadowTreeWalker::traverseSiblingOrBackToInsertionPoint):
     29        (WebCore::ComposedShadowTreeWalker::traverseParent):
     30        * dom/ContainerNodeAlgorithms.cpp:
     31        (WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoDocument):
     32        (WebCore::ChildNodeInsertionNotifier::notifyDescendantInsertedIntoTree):
     33        (WebCore::ChildNodeRemovalNotifier::notifyDescendantRemovedFromDocument):
     34        (WebCore::ChildNodeRemovalNotifier::notifyDescendantRemovedFromTree):
     35        * dom/DOMAllInOne.cpp:
     36        * dom/Document.cpp:
     37        (WebCore::Document::buildAccessKeyMap):
     38        * dom/Element.cpp:
     39        (WebCore::Element::~Element):
     40        (WebCore::Element::willRemove):
     41        (WebCore::Element::attach):
     42        (WebCore::Element::detach):
     43        (WebCore::Element::recalcStyle):
     44        (WebCore::Element::hasShadowRoot):
     45        (WebCore::Element::shadow):
     46        (WebCore::Element::ensureShadow):
     47        (WebCore::Element::ensureShadowRoot):
     48        (WebCore::Element::childrenChanged):
     49        * dom/Element.h:
     50        (WebCore):
     51        (Element):
     52        * dom/ElementRareData.h:
     53        (ElementRareData):
     54        (WebCore::ElementRareData::~ElementRareData):
     55        * dom/ElementShadow.cpp: Renamed from Source/WebCore/dom/ShadowTree.cpp.
     56        (WebCore):
     57        (WebCore::ElementShadow::ElementShadow):
     58        (WebCore::ElementShadow::~ElementShadow):
     59        (WebCore::validateShadowRoot):
     60        (WebCore::ElementShadow::addShadowRoot):
     61        (WebCore::ElementShadow::removeAllShadowRoots):
     62        (WebCore::ElementShadow::willRemove):
     63        (WebCore::ElementShadow::setParentTreeScope):
     64        (WebCore::ElementShadow::attach):
     65        (WebCore::ElementShadow::attachHost):
     66        (WebCore::ElementShadow::detach):
     67        (WebCore::ElementShadow::detachHost):
     68        (WebCore::ElementShadow::insertionPointFor):
     69        (WebCore::ElementShadow::selectionFor):
     70        (WebCore::ElementShadow::reattach):
     71        (WebCore::ElementShadow::childNeedsStyleRecalc):
     72        (WebCore::ElementShadow::needsStyleRecalc):
     73        (WebCore::ElementShadow::recalcStyle):
     74        (WebCore::ElementShadow::needsReattachHostChildrenAndShadow):
     75        (WebCore::ElementShadow::hostChildrenChanged):
     76        (WebCore::ElementShadow::setNeedsReattachHostChildrenAndShadow):
     77        (WebCore::ElementShadow::reattachHostChildrenAndShadow):
     78        * dom/ElementShadow.h: Renamed from Source/WebCore/dom/ShadowTree.h.
     79        (WebCore):
     80        (ElementShadow):
     81        (WebCore::ElementShadow::hasShadowRoot):
     82        (WebCore::ElementShadow::youngestShadowRoot):
     83        (WebCore::ElementShadow::oldestShadowRoot):
     84        (WebCore::ElementShadow::selector):
     85        (WebCore::ElementShadow::clearNeedsReattachHostChildrenAndShadow):
     86        (WebCore::ElementShadow::host):
     87        (ShadowRootVector):
     88        (WebCore::ShadowRootVector::ShadowRootVector):
     89        * dom/Node.cpp:
     90        (WebCore::oldestShadowRootFor):
     91        * dom/NodeRenderingContext.cpp:
     92        (WebCore::NodeRenderingContext::NodeRenderingContext):
     93        (WebCore::NodeRenderingContext::hostChildrenChanged):
     94        * dom/NodeRenderingContext.h:
     95        (WebCore):
     96        * dom/ShadowRoot.cpp:
     97        (WebCore::ShadowRoot::create):
     98        (WebCore::ShadowRoot::owner):
     99        * dom/ShadowRoot.h:
     100        (WebCore):
     101        (ShadowRoot):
     102        * dom/TreeScopeAdopter.cpp:
     103        (WebCore::shadowFor):
     104        (WebCore::TreeScopeAdopter::moveTreeToNewScope):
     105        (WebCore::TreeScopeAdopter::moveTreeToNewDocument):
     106        (WebCore::TreeScopeAdopter::moveShadowToNewDocument):
     107        * dom/TreeScopeAdopter.h:
     108        (TreeScopeAdopter):
     109        * html/ColorInputType.cpp:
     110        (WebCore::ColorInputType::createShadowSubtree):
     111        (WebCore::ColorInputType::shadowColorSwatch):
     112        * html/FileInputType.cpp:
     113        (WebCore::FileInputType::createShadowSubtree):
     114        (WebCore::FileInputType::multipleAttributeChanged):
     115        * html/HTMLDetailsElement.cpp:
     116        (WebCore::HTMLDetailsElement::findMainSummary):
     117        * html/HTMLKeygenElement.cpp:
     118        (WebCore::HTMLKeygenElement::shadowSelect):
     119        * html/HTMLMediaElement.cpp:
     120        (WebCore::HTMLMediaElement::mediaControls):
     121        (WebCore::HTMLMediaElement::hasMediaControls):
     122        * html/HTMLSummaryElement.cpp:
     123        * html/HTMLTextAreaElement.cpp:
     124        (WebCore::HTMLTextAreaElement::innerTextElement):
     125        (WebCore::HTMLTextAreaElement::updatePlaceholderText):
     126        * html/InputType.cpp:
     127        (WebCore::InputType::destroyShadowSubtree):
     128        * html/RangeInputType.cpp:
     129        (WebCore::RangeInputType::handleMouseDownEvent):
     130        (WebCore::RangeInputType::createShadowSubtree):
     131        * html/TextFieldInputType.cpp:
     132        (WebCore::TextFieldInputType::createShadowSubtree):
     133        (WebCore::TextFieldInputType::updatePlaceholderText):
     134        * html/ValidationMessage.cpp:
     135        (WebCore::ValidationMessage::deleteBubbleTree):
     136        * html/shadow/HTMLContentElement.cpp:
     137        (WebCore::HTMLContentElement::parseAttribute):
     138        * html/shadow/InsertionPoint.cpp:
     139        (WebCore::InsertionPoint::attach):
     140        (WebCore::InsertionPoint::detach):
     141        (WebCore::InsertionPoint::distributeHostChildren):
     142        (WebCore::InsertionPoint::clearDistribution):
     143        * html/shadow/InsertionPoint.h:
     144        * html/shadow/SliderThumbElement.cpp:
     145        (WebCore::sliderThumbElementOf):
     146        (WebCore::RenderSliderContainer::layout):
     147        (WebCore::trackLimiterElementOf):
     148        * html/shadow/TextFieldDecorationElement.cpp:
     149        (WebCore::getDecorationRootAndDecoratedRoot):
     150        * inspector/InspectorDOMAgent.cpp:
     151        (WebCore::InspectorDOMAgent::unbind):
     152        (WebCore::InspectorDOMAgent::buildObjectForNode):
     153        * page/FocusController.cpp:
     154        (WebCore::FocusScope::focusScopeOf):
     155        (WebCore::FocusScope::focusScopeOwnedByShadowHost):
     156        * rendering/RenderFileUploadControl.cpp:
     157        (WebCore::RenderFileUploadControl::uploadButton):
     158        * svg/SVGTRefElement.cpp:
     159        (WebCore::SVGTRefElement::updateReferencedText):
     160        (WebCore::SVGTRefElement::detachTarget):
     161        * svg/SVGUseElement.cpp:
     162        (WebCore::SVGUseElement::clearResourceReferences):
     163        (WebCore::SVGUseElement::buildShadowAndInstanceTree):
     164        (WebCore::SVGUseElement::buildShadowTree):
     165        * testing/Internals.cpp:
     166        (WebCore::Internals::ensureShadowRoot):
     167        (WebCore::Internals::youngestShadowRoot):
     168        (WebCore::Internals::oldestShadowRoot):
     169        (WebCore::Internals::removeShadowRoot):
     170
    11712012-05-06  Sheriff Bot  <webkit.review.bot@gmail.com>
    2172

  • trunk/Source/WebCore/GNUmakefile.list.am

    r116227 r116277  
    18311831        Source/WebCore/dom/Element.cpp \
    18321832        Source/WebCore/dom/Element.h \
     1833        Source/WebCore/dom/ElementShadow.cpp \
     1834        Source/WebCore/dom/ElementShadow.h \
    18331835        Source/WebCore/dom/ElementAttributeData.cpp \
    18341836        Source/WebCore/dom/ElementAttributeData.h \
    … …  
    19601962        Source/WebCore/dom/ShadowRoot.cpp \
    19611963        Source/WebCore/dom/ShadowRoot.h \
    1962         Source/WebCore/dom/ShadowTree.cpp \
    1963         Source/WebCore/dom/ShadowTree.h \
    19641964        Source/WebCore/dom/SpaceSplitString.cpp \
    19651965        Source/WebCore/dom/SpaceSplitString.h \

  • trunk/Source/WebCore/Target.pri

    r116107 r116277  
    551551    dom/EditingText.cpp \
    552552    dom/Element.cpp \
     553    dom/ElementShadow.cpp \
    553554    dom/ElementAttributeData.cpp \
    554555    dom/EntityReference.cpp \
    … …  
    609610    dom/SelectorQuery.cpp \
    610611    dom/ShadowRoot.cpp \
    611     dom/ShadowTree.cpp \
    612612    dom/SpaceSplitString.cpp \
    613613    dom/StaticNodeList.cpp \
    … …  
    17081708    dom/EditingText.h \
    17091709    dom/Element.h \
     1710    dom/ElementShadow.h \
    17101711    dom/ElementAttributeData.h \
    17111712    dom/Entity.h \
    … …  
    17571758    dom/SelectorQuery.h \
    17581759    dom/ShadowRoot.h \
    1759     dom/ShadowTree.h \
    17601760    dom/SpaceSplitString.h \
    17611761    dom/StaticNodeList.h \

  • trunk/Source/WebCore/WebCore.exp.in

    r116017 r116277  
    148148__ZN7WebCore10MouseEventC1ERKN3WTF12AtomicStringEbbNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_9ClipboardEEEb
    149149__ZN7WebCore10RenderView10compositorEv
    150 __ZN7WebCore10ShadowTree20removeAllShadowRootsEv
    151150__ZN7WebCore10ScrollView17setUseFixedLayoutEb
    152151__ZN7WebCore10ScrollView18setFixedLayoutSizeERKNS_7IntSizeE
    … …  
    304303__ZN7WebCore13AXObjectCache23focusedUIElementForPageEPKNS_4PageE
    305304__ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
     305__ZN7WebCore13ElementShadow20removeAllShadowRootsEv
    306306__ZN7WebCore13HTTPHeaderMapC1Ev
    307307__ZN7WebCore13HTTPHeaderMapD1Ev
    … …  
    14831483__ZNK7WebCore6Widget9frameRectEv
    14841484__ZNK7WebCore7Element10screenRectEv
    1485 __ZNK7WebCore7Element10shadowTreeEv
     1485__ZNK7WebCore7Element6shadowEv
    14861486__ZNK7WebCore7Element12getAttributeERKNS_13QualifiedNameE
    14871487__ZNK7WebCore7Element13hasShadowRootEv

  • trunk/Source/WebCore/WebCore.gypi

    r116222 r116277  
    626626            'dom/DocumentType.h',
    627627            'dom/Element.h',
     628            'dom/ElementShadow.h',
    628629            'dom/ElementAttributeData.h',
    629630            'dom/Event.h',
    … …  
    653654            'dom/ScriptRunner.h',
    654655            'dom/ShadowRoot.h',
    655             'dom/ShadowTree.h',
    656656            'dom/SpaceSplitString.h',
    657657            'dom/StyledElement.h',
    … …  
    52375237            'dom/EditingText.cpp',
    52385238            'dom/EditingText.h',
     5239            'dom/ElementShadow.cpp',
    52395240            'dom/Element.cpp',
    52405241            'dom/ElementAttributeData.cpp',
    … …  
    53425343            'dom/ShadowRoot.cpp',
    53435344            'dom/ShadowRoot.h',
    5344             'dom/ShadowTree.cpp',
    5345             'dom/ShadowTree.h',
    53465345            'dom/SpaceSplitString.cpp',
    53475346            'dom/StaticHashSetNodeList.cpp',

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r116009 r116277  
    15941594                57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; };
    15951595                57CF497514EE36D700ECFF14 /* InsertionPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 57CF497314EE36D700ECFF14 /* InsertionPoint.h */; };
    1596                 57CF4C8614F7597A00ECFF14 /* ShadowTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */; };
    1597                 57CF4C8714F7597A00ECFF14 /* ShadowTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 57CF4C8514F7597A00ECFF14 /* ShadowTree.h */; };
     1596                57CF4C8614F7597A00ECFF14 /* ElementShadow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF4C8414F7597A00ECFF14 /* ElementShadow.cpp */; };
     1597                57CF4C8714F7597A00ECFF14 /* ElementShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = 57CF4C8514F7597A00ECFF14 /* ElementShadow.h */; };
    15981598                5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; };
    15991599                5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; };
    … …  
    86058605                57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; };
    86068606                57CF497314EE36D700ECFF14 /* InsertionPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InsertionPoint.h; sourceTree = "<group>"; };
    8607                 57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowTree.cpp; sourceTree = "<group>"; };
    8608                 57CF4C8514F7597A00ECFF14 /* ShadowTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowTree.h; sourceTree = "<group>"; };
     8607                57CF4C8414F7597A00ECFF14 /* ElementShadow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ElementShadow.cpp; sourceTree = "<group>"; };
     8608                57CF4C8514F7597A00ECFF14 /* ElementShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementShadow.h; sourceTree = "<group>"; };
    86098609                5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTreeViewer.cpp; sourceTree = "<group>"; };
    86108610                5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = "<group>"; };
    … …  
    2111121111                                A8C4A7F509D563270003AC8D /* Element.h */,
    2111221112                                93EEC1EA09C2877700C515D1 /* Element.idl */,
     21113                                57CF4C8414F7597A00ECFF14 /* ElementShadow.cpp */,
     21114                                57CF4C8514F7597A00ECFF14 /* ElementShadow.h */,
    2111321115                                2CF6878714D32EB500340F39 /* ElementAttributeData.cpp */,
    2111421116                                2CF6878914D32EFF00340F39 /* ElementAttributeData.h */,
    … …  
    2128021282                                A6D169631346B4C1000EB770 /* ShadowRoot.h */,
    2128121283                                A7DB418114CE1F0A00A2E316 /* ShadowRoot.idl */,
    21282                                 57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */,
    21283                                 57CF4C8514F7597A00ECFF14 /* ShadowTree.h */,
    2128421284                                D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */,
    2128521285                                D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */,
    … …  
    2269122691                                93FDAFCA0B11307400E2746F /* EditorInsertAction.h in Headers */,
    2269222692                                A8C4A80709D563270003AC8D /* Element.h in Headers */,
     22693                                57CF4C8714F7597A00ECFF14 /* ElementShadow.h in Headers */,
    2269322694                                2CF6878A14D32EFF00340F39 /* ElementAttributeData.h in Headers */,
    2269422695                                63F5D4F70E8C4B7100C0BD04 /* ElementRareData.h in Headers */,
    … …  
    2422424225                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
    2422524226                                A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
    24226                                 57CF4C8714F7597A00ECFF14 /* ShadowTree.h in Headers */,
    2422724227                                A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */,
    2422824228                                B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */,
    … …  
    2586525865                                ED501DC60B249F2900AE18D9 /* EditorMac.mm in Sources */,
    2586625866                                A8C4A80809D563270003AC8D /* Element.cpp in Sources */,
     25867                                57CF4C8614F7597A00ECFF14 /* ElementShadow.cpp in Sources */,
    2586725868                                2CF6878814D32EB500340F39 /* ElementAttributeData.cpp in Sources */,
    2586825869                                A8CFF6CB0A1561CD000A4234 /* EllipsisBox.cpp in Sources */,
    … …  
    2736527366                                BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
    2736627367                                A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,
    27367                                 57CF4C8614F7597A00ECFF14 /* ShadowTree.cpp in Sources */,
    2736827368                                A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */,
    2736927369                                B2AFFC930D00A5DF0030074D /* ShapeArabic.c in Sources */,

  • trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

    r112845 r116277  
    2929
    3030#include "Element.h"
     31#include "ElementShadow.h"
    3132#include "HTMLContentSelector.h"
    3233#include "InsertionPoint.h"
    33 #include "ShadowTree.h"
     34
    3435
    3536namespace WebCore {
    … …  
    4041}
    4142
    42 static inline ShadowTree* shadowTreeFor(const Node* node)
     43static inline ElementShadow* shadowFor(const Node* node)
    4344{
    4445    if (node && node->isElementNode())
    45         return toElement(node)->shadowTree();
    46     return 0;
    47 }
    48 
    49 static inline ShadowTree* shadowTreeOfParent(const Node* node)
     46        return toElement(node)->shadow();
     47    return 0;
     48}
     49
     50static inline ElementShadow* shadowOfParent(const Node* node)
    5051{
    5152    if (node && node->parentNode())
    52         return shadowTreeFor(node->parentNode());
     53        return shadowFor(node->parentNode());
    5354    return 0;
    5455}
    … …  
    9899    ASSERT(node);
    99100    if (canCrossUpperBoundary()) {
    100         ShadowTree* shadowTree = shadowTreeFor(node);
    101         return (shadowTree && shadowTree->hasShadowRoot()) ? traverseLightChildren(shadowTree->youngestShadowRoot(), direction)
     101        ElementShadow* shadow = shadowFor(node);
     102        return (shadow && shadow->hasShadowRoot()) ? traverseLightChildren(shadow->youngestShadowRoot(), direction)
    102103            : traverseLightChildren(node, direction);
    103104    }
    … …  
    144145{
    145146    ASSERT(node);
    146     ShadowTree* shadowTree = shadowTreeOfParent(node);
    147     if (!shadowTree)
     147    ElementShadow* shadow = shadowOfParent(node);
     148    if (!shadow)
    148149        return traverseSiblingInCurrentTree(node, direction);
    149     HTMLContentSelection* selection = shadowTree->selectionFor(node);
     150    HTMLContentSelection* selection = shadow->selectionFor(node);
    150151    if (!selection)
    151152        return traverseSiblingInCurrentTree(node, direction);
    … …  
    208209        return 0;
    209210    }
    210     if (ShadowTree* shadowTree = shadowTreeOfParent(node)) {
    211         if (HTMLContentSelection* selection = shadowTree->selectionFor(node))
     211    if (ElementShadow* shadow = shadowOfParent(node)) {
     212        if (HTMLContentSelection* selection = shadow->selectionFor(node))
    212213            return traverseParent(selection->insertionPoint());
    213214    }

  • trunk/Source/WebCore/dom/ContainerNodeAlgorithms.cpp

    r114351 r116277  
    2828
    2929#include "Element.h"
    30 #include "ShadowTree.h"
     30#include "ElementShadow.h"
    3131
    3232namespace WebCore {
    … …  
    4747        return;
    4848
    49     if (ShadowTree* tree = toElement(node)->shadowTree()) {
    50         ShadowRootVector roots(tree);
     49    if (ElementShadow* shadow = toElement(node)->shadow()) {
     50        ShadowRootVector roots(shadow);
    5151        for (size_t i = 0; i < roots.size(); ++i)
    5252            notifyNodeInsertedIntoDocument(roots[i].get());
    … …  
    6464        return;
    6565
    66     if (ShadowTree* tree = toElement(node)->shadowTree()) {
    67         for (ShadowRoot* root = tree->youngestShadowRoot(); root; root = root->olderShadowRoot())
     66    if (ElementShadow* shadow = toElement(node)->shadow()) {
     67        for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
    6868            notifyNodeInsertedIntoTree(root);
    6969    }
    … …  
    8888        node->document()->setCSSTarget(0);
    8989
    90     if (ShadowTree* tree = toElement(node)->shadowTree()) {
    91         ShadowRootVector roots(tree);
     90    if (ElementShadow* shadow = toElement(node)->shadow()) {
     91        ShadowRootVector roots(shadow);
    9292        for (size_t i = 0; i < roots.size(); ++i)
    9393            notifyNodeRemovedFromDocument(roots[i].get());
    … …  
    105105        return;
    106106
    107     if (ShadowTree* tree = toElement(node)->shadowTree()) {
    108         ShadowRootVector roots(tree);
     107    if (ElementShadow* shadow = toElement(node)->shadow()) {
     108        ShadowRootVector roots(shadow);
    109109        for (size_t i = 0; i < roots.size(); ++i)
    110110            notifyNodeRemovedFromTree(roots[i].get());

  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r114871 r116277  
    7070#include "Element.cpp"
    7171#include "ElementAttributeData.cpp"
     72#include "ElementShadow.cpp"
    7273#include "EntityReference.cpp"
    7374#include "ErrorEvent.cpp"
    … …  
    119120#include "SelectorQuery.cpp"
    120121#include "ShadowRoot.cpp"
    121 #include "ShadowTree.cpp"
    122122#include "SpaceSplitString.cpp"
    123123#include "StaticHashSetNodeList.cpp"

  • trunk/Source/WebCore/dom/Document.cpp

    r116248 r116277  
    6161#include "Editor.h"
    6262#include "Element.h"
     63#include "ElementShadow.h"
    6364#include "EntityReference.h"
    6465#include "Event.h"
    … …  
    141142#include "Settings.h"
    142143#include "ShadowRoot.h"
    143 #include "ShadowTree.h"
    144144#include "StaticHashSetNodeList.h"
    145145#include "StyleResolver.h"
    … …  
    714714
    715715        if (element->hasShadowRoot()) {
    716             for (ShadowRoot* root = element->shadowTree()->youngestShadowRoot(); root; root = root->olderShadowRoot())
     716            for (ShadowRoot* root = element->shadow()->youngestShadowRoot(); root; root = root->olderShadowRoot())
    717717                buildAccessKeyMap(root);
    718718        }

  • trunk/Source/WebCore/dom/Element.cpp

    r116255 r116277  
    134134#endif
    135135
    136     if (shadowTree())
    137         rareData()->m_shadowTree.clear();
     136    if (shadow())
     137        rareData()->m_shadow.clear();
    138138    if (m_attributeData)
    139139        m_attributeData->clearAttributes(this);
    … …  
    909909        setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
    910910#endif
    911     if (ShadowTree* tree = shadowTree())
    912         tree->willRemove();
     911    if (ElementShadow* shadow = this->shadow())
     912        shadow->willRemove();
    913913    ContainerNode::willRemove();
    914914}
    … …  
    975975
    976976    // When a shadow root exists, it does the work of attaching the children.
    977     if (ShadowTree* tree = shadowTree()) {
     977    if (ElementShadow* shadow = this->shadow()) {
    978978        parentPusher.push();
    979         tree->attachHost(this);
     979        shadow->attachHost(this);
    980980    } else {
    981981        if (firstChild())
    … …  
    10131013        rareData()->resetComputedStyle();
    10141014
    1015     if (ShadowTree* tree = shadowTree())
    1016         tree->detachHost(this);
     1015    if (ElementShadow* shadow = this->shadow())
     1016        shadow->detachHost(this);
    10171017    else
    10181018        ContainerNode::detach();
    … …  
    11581158    // FIXME: This does not care about sibling combinators. Will be necessary in XBL2 world.
    11591159    if (hasShadowRoot()) {
    1160         ShadowTree* tree = shadowTree();
    1161         if (change >= Inherit || tree->childNeedsStyleRecalc() || tree->needsStyleRecalc()) {
     1160        ElementShadow* shadow = this->shadow();
     1161        if (change >= Inherit || shadow->childNeedsStyleRecalc() || shadow->needsStyleRecalc()) {
    11621162            parentPusher.push();
    1163             tree->recalcShadowTreeStyle(change);
     1163            shadow->recalcStyle(change);
    11641164        }
    11651165    }
    … …  
    11981198bool Element::hasShadowRoot() const
    11991199{
    1200     if (ShadowTree* tree = shadowTree())
    1201         return tree->hasShadowRoot();
     1200    if (ElementShadow* shadow = this->shadow())
     1201        return shadow->hasShadowRoot();
    12021202    return false;
    12031203}
    12041204
    1205 ShadowTree* Element::shadowTree() const
     1205ElementShadow* Element::shadow() const
    12061206{
    12071207    if (!hasRareData())
    12081208        return 0;
    12091209
    1210     return rareData()->m_shadowTree.get();
    1211 }
    1212 
    1213 ShadowTree* Element::ensureShadowTree()
    1214 {
    1215     if (ShadowTree* tree = ensureRareData()->m_shadowTree.get())
    1216         return tree;
    1217 
    1218     rareData()->m_shadowTree = adoptPtr(new ShadowTree());
    1219     return rareData()->m_shadowTree.get();
     1210    return rareData()->m_shadow.get();
     1211}
     1212
     1213ElementShadow* Element::ensureShadow()
     1214{
     1215    if (ElementShadow* shadow = ensureRareData()->m_shadow.get())
     1216        return shadow;
     1217
     1218    rareData()->m_shadow = adoptPtr(new ElementShadow());
     1219    return rareData()->m_shadow.get();
    12201220}
    12211221
    … …  
    12231223{
    12241224    if (hasShadowRoot())
    1225         return shadowTree()->oldestShadowRoot();
     1225        return shadow()->oldestShadowRoot();
    12261226
    12271227    return ShadowRoot::create(this, ShadowRoot::CreatingUserAgentShadowRoot).get();
    … …  
    13601360    if (hasRareData()) {
    13611361        if (hasShadowRoot())
    1362             shadowTree()->hostChildrenChanged();
     1362            shadow()->hostChildrenChanged();
    13631363    }
    13641364}

  • trunk/Source/WebCore/dom/Element.h

    r115645 r116277  
    4343class IntSize;
    4444class ShadowRoot;
    45 class ShadowTree;
     45class ElementShadow;
    4646class WebKitAnimationList;
    4747
    … …  
    263263
    264264    bool hasShadowRoot() const;
    265     ShadowTree* shadowTree() const;
    266     ShadowTree* ensureShadowTree();
     265    ElementShadow* shadow() const;
     266    ElementShadow* ensureShadow();
    267267
    268268    // FIXME: Remove Element::ensureShadowRoot

  • trunk/Source/WebCore/dom/ElementRareData.h

    r113665 r116277  
    2626#include "DatasetDOMStringMap.h"
    2727#include "Element.h"
     28#include "ElementShadow.h"
    2829#include "HTMLCollection.h"
    2930#include "NamedNodeMap.h"
    3031#include "NodeRareData.h"
    31 #include "ShadowTree.h"
    3232#include <wtf/OwnPtr.h>
    3333
    … …  
    7070    OwnPtr<DatasetDOMStringMap> m_datasetDOMStringMap;
    7171    OwnPtr<ClassList> m_classList;
    72     OwnPtr<ShadowTree> m_shadowTree;
     72    OwnPtr<ElementShadow> m_shadow;
    7373    OwnPtr<NamedNodeMap> m_attributeMap;
    7474
    … …  
    9999inline ElementRareData::~ElementRareData()
    100100{
    101     ASSERT(!m_shadowTree);
     101    ASSERT(!m_shadow);
    102102}
    103103

  • trunk/Source/WebCore/dom/ElementShadow.cpp

    r116276 r116277  
    2626
    2727#include "config.h"
    28 #include "ShadowTree.h"
     28#include "ElementShadow.h"
    2929
    3030#include "ContainerNodeAlgorithms.h"
    … …  
    4040namespace WebCore {
    4141
    42 ShadowTree::ShadowTree()
     42ElementShadow::ElementShadow()
    4343    : m_needsRecalculateContent(false)
    4444{
    4545}
    4646
    47 ShadowTree::~ShadowTree()
     47ElementShadow::~ElementShadow()
    4848{
    4949    if (hasShadowRoot())
    … …  
    6969}
    7070
    71 void ShadowTree::addShadowRoot(Element* shadowHost, PassRefPtr<ShadowRoot> shadowRoot, ExceptionCode& ec)
     71void ElementShadow::addShadowRoot(Element* shadowHost, PassRefPtr<ShadowRoot> shadowRoot, ExceptionCode& ec)
    7272{
    7373    ASSERT(shadowHost);
    … …  
    9090}
    9191
    92 void ShadowTree::removeAllShadowRoots()
     92void ElementShadow::removeAllShadowRoots()
    9393{
    9494    if (!hasShadowRoot())
    … …  
    116116}
    117117
    118 void ShadowTree::willRemove()
     118void ElementShadow::willRemove()
    119119{
    120120    ShadowRootVector roots(this);
    … …  
    123123}
    124124
    125 void ShadowTree::setParentTreeScope(TreeScope* scope)
     125void ElementShadow::setParentTreeScope(TreeScope* scope)
    126126{
    127127    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
    … …  
    129129}
    130130
    131 void ShadowTree::attach()
     131void ElementShadow::attach()
    132132{
    133133    // Children of m_selector is populated lazily in
    … …  
    143143}
    144144
    145 void ShadowTree::attachHost(Element* host)
     145void ElementShadow::attachHost(Element* host)
    146146{
    147147    attach();
    … …  
    150150}
    151151
    152 void ShadowTree::detach()
     152void ElementShadow::detach()
    153153{
    154154    for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
    … …  
    158158}
    159159
    160 void ShadowTree::detachHost(Element* host)
     160void ElementShadow::detachHost(Element* host)
    161161{
    162162    host->detachChildrenIfNeeded();
    … …  
    165165}
    166166
    167 InsertionPoint* ShadowTree::insertionPointFor(const Node* node) const
     167InsertionPoint* ElementShadow::insertionPointFor(const Node* node) const
    168168{
    169169    ASSERT(node && node->parentNode());
    … …  
    182182}
    183183
    184 HTMLContentSelection* ShadowTree::selectionFor(const Node* node) const
     184HTMLContentSelection* ElementShadow::selectionFor(const Node* node) const
    185185{
    186186    return m_selector.findFor(node);
    187187}
    188188
    189 void ShadowTree::reattach()
     189void ElementShadow::reattach()
    190190{
    191191    detach();
    … …  
    193193}
    194194
    195 bool ShadowTree::childNeedsStyleRecalc()
     195bool ElementShadow::childNeedsStyleRecalc()
    196196{
    197197    ASSERT(youngestShadowRoot());
    … …  
    203203}
    204204
    205 bool ShadowTree::needsStyleRecalc()
     205bool ElementShadow::needsStyleRecalc()
    206206{
    207207    ASSERT(youngestShadowRoot());
    … …  
    213213}
    214214
    215 void ShadowTree::recalcShadowTreeStyle(Node::StyleChange change)
     215void ElementShadow::recalcStyle(Node::StyleChange change)
    216216{
    217217    ShadowRoot* youngest = youngestShadowRoot();
    … …  
    241241}
    242242
    243 bool ShadowTree::needsReattachHostChildrenAndShadow()
     243bool ElementShadow::needsReattachHostChildrenAndShadow()
    244244{
    245245    return m_needsRecalculateContent || (youngestShadowRoot() && youngestShadowRoot()->hasInsertionPoint());
    246246}
    247247
    248 void ShadowTree::hostChildrenChanged()
     248void ElementShadow::hostChildrenChanged()
    249249{
    250250    ASSERT(youngestShadowRoot());
    … …  
    257257}
    258258
    259 void ShadowTree::setNeedsReattachHostChildrenAndShadow()
     259void ElementShadow::setNeedsReattachHostChildrenAndShadow()
    260260{
    261261    m_needsRecalculateContent = true;
    … …  
    264264}
    265265
    266 void ShadowTree::reattachHostChildrenAndShadow()
     266void ElementShadow::reattachHostChildrenAndShadow()
    267267{
    268268    ASSERT(youngestShadowRoot());

  • trunk/Source/WebCore/dom/ElementShadow.h

    r116276 r116277  
    2525 */
    2626
    27 #ifndef ShadowTree_h
    28 #define ShadowTree_h
     27#ifndef ElementShadow_h
     28#define ElementShadow_h
    2929
    3030#include "ExceptionCode.h"
    … …  
    4545class HTMLContentSelection;
    4646
    47 class ShadowTree {
     47class ElementShadow {
    4848public:
    49     ShadowTree();
    50     ~ShadowTree();
     49    ElementShadow();
     50    ~ElementShadow();
    5151
    5252    Element* host() const;
    … …  
    7171    bool childNeedsStyleRecalc();
    7272    bool needsStyleRecalc();
    73     void recalcShadowTreeStyle(Node::StyleChange);
     73    void recalcStyle(Node::StyleChange);
    7474    void setNeedsReattachHostChildrenAndShadow();
    7575    void clearNeedsReattachHostChildrenAndShadow();
    … …  
    8989    HTMLContentSelector m_selector;
    9090    bool m_needsRecalculateContent : 1;
    91     WTF_MAKE_NONCOPYABLE(ShadowTree);
     91    WTF_MAKE_NONCOPYABLE(ElementShadow);
    9292};
    9393
    94 inline bool ShadowTree::hasShadowRoot() const
     94inline bool ElementShadow::hasShadowRoot() const
    9595{
    9696    return !m_shadowRoots.isEmpty();
    9797}
    9898
    99 inline ShadowRoot* ShadowTree::youngestShadowRoot() const
     99inline ShadowRoot* ElementShadow::youngestShadowRoot() const
    100100{
    101101    return m_shadowRoots.head();
    102102}
    103103
    104 inline ShadowRoot* ShadowTree::oldestShadowRoot() const
     104inline ShadowRoot* ElementShadow::oldestShadowRoot() const
    105105{
    106106    return m_shadowRoots.tail();
    107107}
    108108
    109 inline HTMLContentSelector& ShadowTree::selector()
     109inline HTMLContentSelector& ElementShadow::selector()
    110110{
    111111    return m_selector;
    112112}
    113113
    114 inline const HTMLContentSelector& ShadowTree::selector() const
     114inline const HTMLContentSelector& ElementShadow::selector() const
    115115{
    116116    return m_selector;
    117117}
    118118
    119 inline void ShadowTree::clearNeedsReattachHostChildrenAndShadow()
     119inline void ElementShadow::clearNeedsReattachHostChildrenAndShadow()
    120120{
    121121    m_needsRecalculateContent = false;
    122122}
    123123
    124 inline Element* ShadowTree::host() const
     124inline Element* ElementShadow::host() const
    125125{
    126126    ASSERT(hasShadowRoot());
    … …  
    130130class ShadowRootVector : public Vector<RefPtr<ShadowRoot> > {
    131131public:
    132     explicit ShadowRootVector(ShadowTree* tree)
     132    explicit ShadowRootVector(ElementShadow* tree)
    133133    {
    134134        for (ShadowRoot* root = tree->youngestShadowRoot(); root; root = root->olderShadowRoot())

  • trunk/Source/WebCore/dom/Node.cpp

    r116198 r116277  
    4848#include "DynamicNodeList.h"
    4949#include "Element.h"
     50#include "ElementShadow.h"
    5051#include "Event.h"
    5152#include "EventContext.h"
    … …  
    8687#include "Settings.h"
    8788#include "ShadowRoot.h"
    88 #include "ShadowTree.h"
    8989#include "StaticNodeList.h"
    9090#include "StorageEvent.h"
    … …  
    836836inline static ShadowRoot* oldestShadowRootFor(const Node* node)
    837837{
    838     return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->oldestShadowRoot() : 0;
     838    return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadow()->oldestShadowRoot() : 0;
    839839}
    840840

  • trunk/Source/WebCore/dom/NodeRenderingContext.cpp

    r115297 r116277  
    2828
    2929#include "ContainerNode.h"
     30#include "ElementShadow.h"
    3031#include "FlowThreadController.h"
    3132#include "HTMLContentElement.h"
    … …  
    3940#include "RenderView.h"
    4041#include "ShadowRoot.h"
    41 #include "ShadowTree.h"
    4242
    4343#if ENABLE(SVG)
    … …  
    5656    , m_node(node)
    5757    , m_parentNodeForRenderingAndStyle(0)
    58     , m_visualParentShadowTree(0)
     58    , m_visualParentShadow(0)
    5959    , m_insertionPoint(0)
    6060    , m_style(0)
    … …  
    7373    if (parent->isElementNode() || parent->isShadowRoot()) {
    7474        if (parent->isElementNode() && toElement(parent)->hasShadowRoot())
    75             m_visualParentShadowTree = toElement(parent)->shadowTree();
     75            m_visualParentShadow = toElement(parent)->shadow();
    7676        else if (parent->isShadowRoot())
    77             m_visualParentShadowTree = toShadowRoot(parent)->tree();
    78 
    79         if (m_visualParentShadowTree) {
    80             if ((m_insertionPoint = m_visualParentShadowTree->insertionPointFor(m_node))) {
     77            m_visualParentShadow = toShadowRoot(parent)->owner();
     78
     79        if (m_visualParentShadow) {
     80            if ((m_insertionPoint = m_visualParentShadow->insertionPointFor(m_node))) {
    8181                if (toShadowRoot(m_insertionPoint->shadowTreeRootNode())->isUsedForRendering()) {
    8282                    m_phase = AttachingDistributed;
    … …  
    119119    , m_node(node)
    120120    , m_parentNodeForRenderingAndStyle(0)
    121     , m_visualParentShadowTree(0)
     121    , m_visualParentShadow(0)
    122122    , m_insertionPoint(0)
    123123    , m_style(style)
    … …  
    294294void NodeRenderingContext::hostChildrenChanged()
    295295{
    296     if (m_phase == AttachingNotDistributed && m_visualParentShadowTree)
    297         m_visualParentShadowTree->hostChildrenChanged();
     296    if (m_phase == AttachingNotDistributed && m_visualParentShadow)
     297        m_visualParentShadow->hostChildrenChanged();
    298298}
    299299

  • trunk/Source/WebCore/dom/NodeRenderingContext.h

    r112453 r116277  
    4040class RenderObject;
    4141class RenderStyle;
    42 class ShadowTree;
     42class ElementShadow;
    4343
    4444class NodeRenderingContext {
    … …  
    8484    Node* m_node;
    8585    ContainerNode* m_parentNodeForRenderingAndStyle;
    86     ShadowTree* m_visualParentShadowTree;
     86    ElementShadow* m_visualParentShadow;
    8787    InsertionPoint* m_insertionPoint;
    8888    RefPtr<RenderStyle> m_style;

  • trunk/Source/WebCore/dom/ShadowRoot.cpp

    r115215 r116277  
    3333#include "DocumentFragment.h"
    3434#include "Element.h"
     35#include "ElementShadow.h"
    3536#include "HTMLContentElement.h"
    3637#include "HTMLContentSelector.h"
    … …  
    3839#include "InsertionPoint.h"
    3940#include "NodeRareData.h"
    40 #include "ShadowTree.h"
    4141#include "SVGNames.h"
    4242#include "StyleResolver.h"
    … …  
    119119
    120120    ec = 0;
    121     element->ensureShadowTree()->addShadowRoot(element, shadowRoot, ec);
     121    element->ensureShadow()->addShadowRoot(element, shadowRoot, ec);
    122122    if (ec)
    123123        return 0;
    … …  
    172172}
    173173
    174 ShadowTree* ShadowRoot::tree() const
     174ElementShadow* ShadowRoot::owner() const
    175175{
    176176    if (host())
    177         return host()->shadowTree();
     177        return host()->shadow();
    178178    return 0;
    179179}

  • trunk/Source/WebCore/dom/ShadowRoot.h

    r113667 r116277  
    4242class HTMLContentSelector;
    4343class InsertionPoint;
    44 class ShadowTree;
     44class ElementShadow;
    4545
    4646class ShadowRoot : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> {
    … …  
    7272
    7373    Element* host() const { return shadowHost(); }
    74     ShadowTree* tree() const;
     74    ElementShadow* owner() const;
    7575
    7676    String innerHTML() const;

  • trunk/Source/WebCore/dom/TreeScopeAdopter.cpp

    r109290 r116277  
    2727
    2828#include "Document.h"
     29#include "ElementShadow.h"
    2930#include "NodeRareData.h"
    3031#include "ShadowRoot.h"
    31 #include "ShadowTree.h"
    3232
    3333namespace WebCore {
    3434
    35 static inline ShadowTree* shadowTreeFor(Node* node)
     35static inline ElementShadow* shadowFor(Node* node)
    3636{
    37     return node->isElementNode() ? toElement(node)->shadowTree() : 0;
     37    return node->isElementNode() ? toElement(node)->shadow() : 0;
    3838}
    3939
    … …  
    6464            moveNodeToNewDocument(node, oldDocument, newDocument);
    6565
    66         if (ShadowTree* tree = shadowTreeFor(node)) {
    67             tree->setParentTreeScope(m_newScope);
     66        if (ElementShadow* shadow = shadowFor(node)) {
     67            shadow->setParentTreeScope(m_newScope);
    6868            if (willMoveToNewDocument)
    69                 moveShadowTreeToNewDocument(tree, oldDocument, newDocument);
     69                moveShadowToNewDocument(shadow, oldDocument, newDocument);
    7070        }
    7171    }
    … …  
    7676    for (Node* node = root; node; node = node->traverseNextNode(root)) {
    7777        moveNodeToNewDocument(node, oldDocument, newDocument);
    78         if (ShadowTree* tree = shadowTreeFor(node))
    79             moveShadowTreeToNewDocument(tree, oldDocument, newDocument);
     78        if (ElementShadow* shadow = shadowFor(node))
     79            moveShadowToNewDocument(shadow, oldDocument, newDocument);
    8080    }
    8181}
    8282
    83 inline void TreeScopeAdopter::moveShadowTreeToNewDocument(ShadowTree* tree, Document* oldDocument, Document* newDocument) const
     83inline void TreeScopeAdopter::moveShadowToNewDocument(ElementShadow* shadow, Document* oldDocument, Document* newDocument) const
    8484{
    85     for (ShadowRoot* root = tree->youngestShadowRoot(); root; root = root->olderShadowRoot())
     85    for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
    8686        moveTreeToNewDocument(root, oldDocument, newDocument);
    8787}

  • trunk/Source/WebCore/dom/TreeScopeAdopter.h

    r109290 r116277  
    4747    void moveTreeToNewDocument(Node*, Document* oldDocument, Document* newDocument) const;
    4848    void moveNodeToNewDocument(Node*, Document* oldDocument, Document* newDocument) const;
    49     void moveShadowTreeToNewDocument(ShadowTree*, Document* oldDocument, Document* newDocument) const;
     49    void moveShadowToNewDocument(ElementShadow*, Document* oldDocument, Document* newDocument) const;
    5050
    5151    Node* m_toAdopt;

  • trunk/Source/WebCore/html/ColorInputType.cpp

    r115704 r116277  
    3535#include "Chrome.h"
    3636#include "Color.h"
     37#include "ElementShadow.h"
    3738#include "HTMLDivElement.h"
    3839#include "HTMLInputElement.h"
    … …  
    4041#include "ScriptController.h"
    4142#include "ShadowRoot.h"
    42 #include "ShadowTree.h"
    4343
    4444#include <wtf/PassOwnPtr.h>
    … …  
    118118    wrapperElement->appendChild(colorSwatch.release(), ec);
    119119    ASSERT(!ec);
    120     element()->shadowTree()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);
     120    element()->shadow()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);
    121121    ASSERT(!ec);
    122122   
    … …  
    192192HTMLElement* ColorInputType::shadowColorSwatch() const
    193193{
    194     ShadowRoot* shadow = element()->shadowTree()->oldestShadowRoot();
     194    ShadowRoot* shadow = element()->shadow()->oldestShadowRoot();
    195195    return shadow ? toHTMLElement(shadow->firstChild()->firstChild()) : 0;
    196196}

  • trunk/Source/WebCore/html/FileInputType.cpp

    r111569 r116277  
    2424
    2525#include "Chrome.h"
     26#include "ElementShadow.h"
    2627#include "Event.h"
    2728#include "File.h"
    … …  
    3738#include "ScriptController.h"
    3839#include "ShadowRoot.h"
    39 #include "ShadowTree.h"
    4040#include <wtf/PassOwnPtr.h>
    4141#include <wtf/text/StringBuilder.h>
    … …  
    295295    ASSERT(element()->hasShadowRoot());
    296296    ExceptionCode ec = 0;
    297     element()->shadowTree()->oldestShadowRoot()->appendChild(element()->multiple() ? UploadButtonElement::createForMultiple(element()->document()): UploadButtonElement::create(element()->document()), ec);
     297    element()->shadow()->oldestShadowRoot()->appendChild(element()->multiple() ? UploadButtonElement::createForMultiple(element()->document()): UploadButtonElement::create(element()->document()), ec);
    298298}
    299299
    … …  
    301301{
    302302    ASSERT(element()->hasShadowRoot());
    303     UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadowTree()->oldestShadowRoot()->firstChild());
     303    UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadow()->oldestShadowRoot()->firstChild());
    304304    if (button)
    305305        button->setValue(element()->multiple() ? fileButtonChooseMultipleFilesLabel() : fileButtonChooseFileLabel());

  • trunk/Source/WebCore/html/HTMLDetailsElement.cpp

    r109721 r116277  
    2424#if ENABLE(DETAILS)
    2525
     26#include "ElementShadow.h"
    2627#include "HTMLContentElement.h"
    2728#include "HTMLNames.h"
    … …  
    3233#include "RenderBlock.h"
    3334#include "ShadowRoot.h"
    34 #include "ShadowTree.h"
    3535#include "Text.h"
    3636
    … …  
    125125    }
    126126
    127     return static_cast<DetailsSummaryElement*>(shadowTree()->oldestShadowRoot()->firstChild())->fallbackSummary();
     127    return static_cast<DetailsSummaryElement*>(shadow()->oldestShadowRoot()->firstChild())->fallbackSummary();
    128128}
    129129

  • trunk/Source/WebCore/html/HTMLKeygenElement.cpp

    r111659 r116277  
    2828#include "Attribute.h"
    2929#include "Document.h"
     30#include "ElementShadow.h"
    3031#include "FormDataList.h"
    3132#include "HTMLNames.h"
    … …  
    3435#include "SSLKeyGenerator.h"
    3536#include "ShadowRoot.h"
    36 #include "ShadowTree.h"
    3737#include "Text.h"
    3838#include <wtf/StdLibExtras.h>
    … …  
    133133{
    134134    ASSERT(hasShadowRoot());
    135     ShadowRoot* shadow = shadowTree()->oldestShadowRoot();
    136     return shadow ? toHTMLSelectElement(shadow->firstChild()) : 0;
     135    ShadowRoot* root = this->shadow()->oldestShadowRoot();
     136    return root ? toHTMLSelectElement(root->firstChild()) : 0;
    137137}
    138138

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r115896 r116277  
    4141#include "CSSValueKeywords.h"
    4242#include "DocumentLoader.h"
     43#include "ElementShadow.h"
    4344#include "Event.h"
    4445#include "EventNames.h"
    … …  
    7677#include "Settings.h"
    7778#include "ShadowRoot.h"
    78 #include "ShadowTree.h"
    7979#include "TimeRanges.h"
    8080#include "UUID.h"
    … …  
    40704070MediaControls* HTMLMediaElement::mediaControls()
    40714071{
    4072     return toMediaControls(shadowTree()->oldestShadowRoot()->firstChild());
     4072    return toMediaControls(shadow()->oldestShadowRoot()->firstChild());
    40734073}
    40744074
    … …  
    40784078        return false;
    40794079
    4080     Node* node = shadowTree()->oldestShadowRoot()->firstChild();
     4080    Node* node = shadow()->oldestShadowRoot()->firstChild();
    40814081    return node && node->isMediaControls();
    40824082}

  • trunk/Source/WebCore/html/HTMLSummaryElement.cpp

    r110151 r116277  
    2525
    2626#include "DetailsMarkerControl.h"
     27#include "ElementShadow.h"
    2728#include "HTMLContentElement.h"
    2829#include "HTMLDetailsElement.h"
    … …  
    3435#include "RenderBlock.h"
    3536#include "ShadowRoot.h"
    36 #include "ShadowTree.h"
    3737
    3838namespace WebCore {

  • trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

    r110320 r116277  
    3131#include "CSSValueKeywords.h"
    3232#include "Document.h"
     33#include "ElementShadow.h"
    3334#include "Event.h"
    3435#include "EventNames.h"
    … …  
    3940#include "RenderTextControlMultiLine.h"
    4041#include "ShadowRoot.h"
    41 #include "ShadowTree.h"
    4242#include "Text.h"
    4343#include "TextControlInnerElements.h"
    … …  
    295295HTMLElement* HTMLTextAreaElement::innerTextElement() const
    296296{
    297     Node* node = shadowTree()->oldestShadowRoot()->firstChild();
     297    Node* node = shadow()->oldestShadowRoot()->firstChild();
    298298    ASSERT(!node || node->hasTagName(divTag));
    299299    return toHTMLElement(node);
    … …  
    473473    if (placeholderText.isEmpty()) {
    474474        if (m_placeholder) {
    475             shadowTree()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec);
     475            shadow()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec);
    476476            ASSERT(!ec);
    477477            m_placeholder.clear();
    … …  
    482482        m_placeholder = HTMLDivElement::create(document());
    483483        m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
    484         shadowTree()->oldestShadowRoot()->insertBefore(m_placeholder, shadowTree()->oldestShadowRoot()->firstChild()->nextSibling(), ec);
     484        shadow()->oldestShadowRoot()->insertBefore(m_placeholder, shadow()->oldestShadowRoot()->firstChild()->nextSibling(), ec);
    485485        ASSERT(!ec);
    486486    }

  • trunk/Source/WebCore/html/InputType.cpp

    r115704 r116277  
    3636#include "DateTimeInputType.h"
    3737#include "DateTimeLocalInputType.h"
     38#include "ElementShadow.h"
    3839#include "EmailInputType.h"
    3940#include "ExceptionCode.h"
    … …  
    6061#include "SearchInputType.h"
    6162#include "ShadowRoot.h"
    62 #include "ShadowTree.h"
    6363#include "SubmitInputType.h"
    6464#include "TelephoneInputType.h"
    … …  
    395395        return;
    396396
    397     ShadowRoot* root = element()->shadowTree()->oldestShadowRoot();
     397    ShadowRoot* root = element()->shadow()->oldestShadowRoot();
    398398    ASSERT(root);
    399399    root->removeAllChildren();

  • trunk/Source/WebCore/html/RangeInputType.cpp

    r115704 r116277  
    3434
    3535#include "AXObjectCache.h"
     36#include "ElementShadow.h"
    3637#include "HTMLDivElement.h"
    3738#include "HTMLInputElement.h"
    … …  
    4344#include "RenderSlider.h"
    4445#include "ShadowRoot.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()->shadowTree()->oldestShadowRoot()))
     164    if (targetNode != element() && !targetNode->isDescendantOf(element()->shadow()->oldestShadowRoot()))
    165165        return;
    166166    SliderThumbElement* thumb = sliderThumbElementOf(element());
    … …  
    248248    container->appendChild(track.release(), ec);
    249249    container->appendChild(TrackLimiterElement::create(document), ec);
    250     element()->shadowTree()->oldestShadowRoot()->appendChild(container.release(), ec);
     250    element()->shadow()->oldestShadowRoot()->appendChild(container.release(), ec);
    251251}
    252252

  • trunk/Source/WebCore/html/TextFieldInputType.cpp

    r115704 r116277  
    3636#include "Chrome.h"
    3737#include "ChromeClient.h"
     38#include "ElementShadow.h"
    3839#include "FormDataList.h"
    3940#include "Frame.h"
    … …  
    4647#include "RenderTheme.h"
    4748#include "ShadowRoot.h"
    48 #include "ShadowTree.h"
    4949#include "TextControlInnerElements.h"
    5050#include "TextEvent.h"
    … …  
    237237    m_innerText = TextControlInnerTextElement::create(document);
    238238    if (!createsContainer) {
    239         element()->shadowTree()->oldestShadowRoot()->appendChild(m_innerText, ec);
    240         return;
    241     }
    242 
    243     ShadowRoot* shadowRoot = element()->shadowTree()->oldestShadowRoot();
     239        element()->shadow()->oldestShadowRoot()->appendChild(m_innerText, ec);
     240        return;
     241    }
     242
     243    ShadowRoot* shadowRoot = element()->shadow()->oldestShadowRoot();
    244244    m_container = HTMLDivElement::create(document);
    245245    m_container->setShadowPseudoId("-webkit-textfield-decoration-container");
    … …  
    406406        m_placeholder = HTMLDivElement::create(element()->document());
    407407        m_placeholder->setShadowPseudoId("-webkit-input-placeholder");
    408         element()->shadowTree()->oldestShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
     408        element()->shadow()->oldestShadowRoot()->insertBefore(m_placeholder, m_container ? m_container->nextSibling() : innerTextElement()->nextSibling(), ec);
    409409        ASSERT(!ec);
    410410    }

  • trunk/Source/WebCore/html/ValidationMessage.cpp

    r115215 r116277  
    3434#include "CSSPropertyNames.h"
    3535#include "CSSValueKeywords.h"
     36#include "ElementShadow.h"
    3637#include "ExceptionCodePlaceholder.h"
    3738#include "FormAssociatedElement.h"
    … …  
    4445#include "Settings.h"
    4546#include "ShadowRoot.h"
    46 #include "ShadowTree.h"
    4747#include "StyleResolver.h"
    4848#include "Text.h"
    … …  
    188188        HTMLElement* host = toHTMLElement(m_element);
    189189        ExceptionCode ec;
    190         host->shadowTree()->oldestShadowRoot()->removeChild(m_bubble.get(), ec);
     190        host->shadow()->oldestShadowRoot()->removeChild(m_bubble.get(), ec);
    191191        m_bubble = 0;
    192192    }

  • trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp

    r110014 r116277  
    2929
    3030#include "ContentSelectorQuery.h"
     31#include "ElementShadow.h"
    3132#include "HTMLContentSelector.h"
    3233#include "HTMLNames.h"
    … …  
    3435#include "RuntimeEnabledFeatures.h"
    3536#include "ShadowRoot.h"
    36 #include "ShadowTree.h"
    3737#include <wtf/StdLibExtras.h>
    3838
    … …  
    9191    if (attr->name() == selectAttr) {
    9292        if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode()))
    93             root->tree()->setNeedsReattachHostChildrenAndShadow();
     93            root->owner()->setNeedsReattachHostChildrenAndShadow();
    9494    } else
    9595        InsertionPoint::parseAttribute(attr);

  • trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

    r114334 r116277  
    3232#include "InsertionPoint.h"
    3333
     34#include "ElementShadow.h"
    3435#include "ShadowRoot.h"
    35 #include "ShadowTree.h"
    3636
    3737namespace WebCore {
    … …  
    5252        ShadowRoot* root = toShadowRoot(treeScope()->rootNode());
    5353        if (doesSelectFromHostChildren()) {
    54             distributeHostChildren(root->tree());
     54            distributeHostChildren(root->owner());
    5555            attachDistributedNode();
    5656        } else if (!root->olderShadowRoot()->assignedTo()) {
    … …  
    6868    ShadowRoot* root = toShadowRoot(shadowTreeRootNode());
    6969    if (root && isActive()) {
    70         ShadowTree* tree = root->tree();
     70        ElementShadow* shadow = root->owner();
    7171
    7272        if (doesSelectFromHostChildren())
    73             clearDistribution(tree);
     73            clearDistribution(shadow);
    7474        else if (ShadowRoot* assignedShadowRoot = assignedFrom())
    7575            clearAssignment(assignedShadowRoot);
    … …  
    7777        // When shadow element is detached, shadow tree should be recreated to re-calculate selector for
    7878        // other insertion points.
    79         tree->setNeedsReattachHostChildrenAndShadow();
     79        shadow->setNeedsReattachHostChildrenAndShadow();
    8080    }
    8181
    … …  
    118118}
    119119
    120 inline void InsertionPoint::distributeHostChildren(ShadowTree* tree)
     120inline void InsertionPoint::distributeHostChildren(ElementShadow* shadow)
    121121{
    122     if (!tree->selector().isSelecting()) {
     122    if (!shadow->selector().isSelecting()) {
    123123        // If HTMLContentSelector is not int selecting phase, it means InsertionPoint is attached from
    124         // non-ShadowTree node. To run distribute algorithm, we have to reattach ShadowTree.
    125         tree->setNeedsReattachHostChildrenAndShadow();
     124        // non-ElementShadow node. To run distribute algorithm, we have to reattach ElementShadow.
     125        shadow->setNeedsReattachHostChildrenAndShadow();
    126126        return;
    127127    }
    128128
    129     tree->selector().populateIfNecessary(tree->host());
    130     tree->selector().unselect(&m_selections);
    131     tree->selector().select(this, &m_selections);
     129    shadow->selector().populateIfNecessary(shadow->host());
     130    shadow->selector().unselect(&m_selections);
     131    shadow->selector().select(this, &m_selections);
    132132}
    133133
    134 inline void InsertionPoint::clearDistribution(ShadowTree* tree)
     134inline void InsertionPoint::clearDistribution(ElementShadow* shadow)
    135135{
    136     tree->selector().unselect(&m_selections);
     136    shadow->selector().unselect(&m_selections);
    137137}
    138138

  • trunk/Source/WebCore/html/shadow/InsertionPoint.h

    r114334 r116277  
    6363
    6464private:
    65     void distributeHostChildren(ShadowTree*);
    66     void clearDistribution(ShadowTree*);
     65    void distributeHostChildren(ElementShadow*);
     66    void clearDistribution(ElementShadow*);
    6767    void attachDistributedNode();
    6868

  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r112547 r116277  
    3535
    3636#include "CSSValueKeywords.h"
     37#include "ElementShadow.h"
    3738#include "Event.h"
    3839#include "Frame.h"
    … …  
    4445#include "RenderTheme.h"
    4546#include "ShadowRoot.h"
    46 #include "ShadowTree.h"
    4747#include "StepRange.h"
    4848#include <wtf/MathExtras.h>
    … …  
    6868{
    6969    ASSERT(node);
    70     ShadowRoot* shadow = node->toInputElement()->shadowTree()->oldestShadowRoot();
     70    ShadowRoot* shadow = node->toInputElement()->shadow()->oldestShadowRoot();
    7171    ASSERT(shadow);
    7272    Node* thumb = shadow->firstChild()->firstChild()->firstChild();
    … …  
    145145    RenderObject* trackRenderer = node()->firstChild()->renderer();
    146146    if (!isVertical && input->renderer()->isSlider() && !inputHeight.isFixed() && !inputHeight.isPercent()) {
    147         RenderObject* thumbRenderer = input->shadowTree()->oldestShadowRoot()->firstChild()->firstChild()->firstChild()->renderer();
     147        RenderObject* thumbRenderer = input->shadow()->oldestShadowRoot()->firstChild()->firstChild()->firstChild()->renderer();
    148148        if (thumbRenderer) {
    149149            style()->setHeight(thumbRenderer->style()->height());
    … …  
    360360    ASSERT(node);
    361361    ASSERT(node->toInputElement()->hasShadowRoot());
    362     ShadowRoot* shadow = node->toInputElement()->shadowTree()->oldestShadowRoot();
     362    ShadowRoot* shadow = node->toInputElement()->shadow()->oldestShadowRoot();
    363363    ASSERT(shadow);
    364364    Node* limiter = shadow->firstChild()->lastChild();

  • trunk/Source/WebCore/html/shadow/TextFieldDecorationElement.cpp

    r112830 r116277  
    3434#include "CSSPropertyNames.h"
    3535#include "CSSValueKeywords.h"
     36#include "ElementShadow.h"
    3637#include "Event.h"
    3738#include "HTMLInputElement.h"
    … …  
    4041#include "RenderImage.h"
    4142#include "ShadowRoot.h"
    42 #include "ShadowTree.h"
    4343
    4444namespace WebCore {
    … …  
    6969static inline void getDecorationRootAndDecoratedRoot(HTMLInputElement* input, ShadowRoot*& decorationRoot, ShadowRoot*& decoratedRoot)
    7070{
    71     ShadowRoot* existingRoot = input->shadowTree()->youngestShadowRoot();
     71    ShadowRoot* existingRoot = input->shadow()->youngestShadowRoot();
    7272    ShadowRoot* newRoot = 0;
    7373    while (existingRoot->childNodeCount() == 1 && existingRoot->firstChild()->hasTagName(shadowTag)) {

  • trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

    r115215 r116277  
    5454#include "DocumentFragment.h"
    5555#include "DocumentType.h"
     56#include "ElementShadow.h"
    5657#include "Event.h"
    5758#include "EventContext.h"
    … …  
    8384#include "Settings.h"
    8485#include "ShadowRoot.h"
    85 #include "ShadowTree.h"
    8686#include "StylePropertySet.h"
    8787#include "StyleResolver.h"
    … …  
    342342
    343343    if (node->isElementNode() && toElement(node)->hasShadowRoot()) {
    344         for (ShadowRoot* root = toElement(node)->shadowTree()->youngestShadowRoot(); root; root = root->olderShadowRoot())
     344        for (ShadowRoot* root = toElement(node)->shadow()->youngestShadowRoot(); root; root = root->olderShadowRoot())
    345345            unbind(root, nodesMap);
    346346    }
    … …  
    12291229        if (element->hasShadowRoot()) {
    12301230            RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > shadowRoots = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
    1231             for (ShadowRoot* root = element->shadowTree()->youngestShadowRoot(); root; root = root->olderShadowRoot())
     1231            for (ShadowRoot* root = element->shadow()->youngestShadowRoot(); root; root = root->olderShadowRoot())
    12321232                shadowRoots->addItem(buildObjectForNode(root, 0, nodesMap));
    12331233            value->setShadowRoots(shadowRoots);

  • trunk/Source/WebCore/page/FocusController.cpp

    r113990 r116277  
    3535#include "EditorClient.h"
    3636#include "Element.h"
     37#include "ElementShadow.h"
    3738#include "Event.h"
    3839#include "EventHandler.h"
    … …  
    5556#include "Settings.h"
    5657#include "ShadowRoot.h"
    57 #include "ShadowTree.h"
    5858#include "SpatialNavigation.h"
    5959#include "Widget.h"
    … …  
    127127    TreeScope* scope = node->treeScope();
    128128    if (scope->rootNode()->isShadowRoot())
    129         return FocusScope(toShadowRoot(scope->rootNode())->tree()->youngestShadowRoot());
     129        return FocusScope(toShadowRoot(scope->rootNode())->owner()->youngestShadowRoot());
    130130    return FocusScope(scope);
    131131}
    … …  
    134134{
    135135    ASSERT(isShadowHost(node));
    136     return FocusScope(toElement(node)->shadowTree()->youngestShadowRoot());
     136    return FocusScope(toElement(node)->shadow()->youngestShadowRoot());
    137137}
    138138

  • trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp

    r110761 r116277  
    2222#include "RenderFileUploadControl.h"
    2323
     24#include "ElementShadow.h"
    2425#include "FileList.h"
    2526#include "GraphicsContext.h"
    … …  
    3334#include "RenderTheme.h"
    3435#include "ShadowRoot.h"
    35 #include "ShadowTree.h"
    3636#include "TextRun.h"
    3737#include "VisiblePosition.h"
    … …  
    226226    ASSERT(input->hasShadowRoot());
    227227
    228     Node* buttonNode = input->shadowTree()->oldestShadowRoot()->firstChild();
     228    Node* buttonNode = input->shadow()->oldestShadowRoot()->firstChild();
    229229    return buttonNode && buttonNode->isHTMLElement() && buttonNode->hasTagName(inputTag) ? static_cast<HTMLInputElement*>(buttonNode) : 0;
    230230}

  • trunk/Source/WebCore/svg/SVGTRefElement.cpp

    r115053 r116277  
    2525#include "SVGTRefElement.h"
    2626
     27#include "ElementShadow.h"
    2728#include "EventListener.h"
    2829#include "EventNames.h"
    … …  
    3334#include "RenderSVGResource.h"
    3435#include "ShadowRoot.h"
    35 #include "ShadowTree.h"
    3636#include "SVGDocument.h"
    3737#include "SVGElementInstance.h"
    … …  
    166166
    167167    ASSERT(hasShadowRoot());
    168     ShadowRoot* root = shadowTree()->oldestShadowRoot();
     168    ShadowRoot* root = shadow()->oldestShadowRoot();
    169169    if (!root->firstChild())
    170170        root->appendChild(SVGShadowText::create(document(), textContent), ASSERT_NO_EXCEPTION);
    … …  
    182182
    183183    ASSERT(hasShadowRoot());
    184     Node* container = shadowTree()->oldestShadowRoot()->firstChild();
     184    Node* container = shadow()->oldestShadowRoot()->firstChild();
    185185    if (container)
    186186        container->setTextContent(emptyContent, ignore);

  • trunk/Source/WebCore/svg/SVGUseElement.cpp

    r115730 r116277  
    3131#include "CachedResourceLoader.h"
    3232#include "Document.h"
     33#include "ElementShadow.h"
    3334#include "Event.h"
    3435#include "EventListener.h"
    … …  
    3940#include "RenderSVGTransformableContainer.h"
    4041#include "ShadowRoot.h"
    41 #include "ShadowTree.h"
    4242#include "SVGElementInstance.h"
    4343#include "SVGElementRareData.h"
    … …  
    394394{
    395395    // FIXME: We should try to optimize this, to at least allow partial reclones.
    396     if (ShadowRoot* shadowTreeRootElement =  shadowTree()->oldestShadowRoot())
     396    if (ShadowRoot* shadowTreeRootElement =  shadow()->oldestShadowRoot())
    397397        shadowTreeRootElement->removeAllChildren();
    398398
    … …  
    481481    ASSERT(m_targetElementInstance->correspondingElement() == target);
    482482
    483     ShadowRoot* shadowTreeRootElement = shadowTree()->oldestShadowRoot();
     483    ShadowRoot* shadowTreeRootElement = shadow()->oldestShadowRoot();
    484484    ASSERT(shadowTreeRootElement);
    485485
    … …  
    696696        removeDisallowedElementsFromSubtree(newChild.get());
    697697
    698     shadowTree()->oldestShadowRoot()->appendChild(newChild.release());
     698    shadow()->oldestShadowRoot()->appendChild(newChild.release());
    699699}
    700700

  • trunk/Source/WebCore/testing/Internals.cpp

    r116246 r116277  
    3636#include "DocumentMarkerController.h"
    3737#include "Element.h"
     38#include "ElementShadow.h"
    3839#include "ExceptionCode.h"
    3940#include "Frame.h"
    … …  
    5859#include "Settings.h"
    5960#include "ShadowRoot.h"
    60 #include "ShadowTree.h"
    6161#include "SpellChecker.h"
    6262#include "TextIterator.h"
    … …  
    304304
    305305    if (host->hasShadowRoot())
    306         return host->shadowTree()->youngestShadowRoot();
     306        return host->shadow()->youngestShadowRoot();
    307307
    308308    return ShadowRoot::create(host, ec).get();
    … …  
    326326        return 0;
    327327
    328     return host->shadowTree()->youngestShadowRoot();
     328    return host->shadow()->youngestShadowRoot();
    329329}
    330330
    … …  
    339339        return 0;
    340340
    341     return host->shadowTree()->oldestShadowRoot();
     341    return host->shadow()->oldestShadowRoot();
    342342}
    343343
    … …  
    370370
    371371    if (host->hasShadowRoot())
    372         host->shadowTree()->removeAllShadowRoots();
     372        host->shadow()->removeAllShadowRoots();
    373373}
    374374

  • trunk/Source/WebKit2/ChangeLog

    r116246 r116277  
     12012-05-06  MORITA Hajime  <morrita@google.com>
     2
     3        https://bugs.webkit.org/show_bug.cgi?id=85265
     4        [Shadow DOM] ShadowTree needs a better name
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        * win/WebKit2.def: Updated exported symbol names according to the rename.
     9        * win/WebKit2CFLite.def: Updated exported symbol names according to the rename.
     10
    1112012-05-06  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    212

  • trunk/Source/WebKit2/win/WebKit2.def

    r116246 r116277  
    202202        ?placeholderShouldBeVisible@HTMLTextFormControlElement@WebCore@@QBE_NXZ
    203203        ?rangeFromLocationAndLength@TextIterator@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@PAVElement@2@HH_N@Z
    204         ?removeAllShadowRoots@ShadowTree@WebCore@@QAEXXZ
     204        ?removeAllShadowRoots@ElementShadow@WebCore@@QAEXXZ
    205205        ?remove@String@WTF@@QAEXIH@Z
    206206        ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
    … …  
    230230        ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
    231231        ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
    232         ?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ
     232        ?shadow@Element@WebCore@@QBEPAVElementShadow@2@XZ
    233233        ?substring@String@WTF@@QBE?AV12@II@Z
    234234        ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ

  • trunk/Source/WebKit2/win/WebKit2CFLite.def

    r115559 r116277  
    195195        ?placeholderShouldBeVisible@HTMLTextFormControlElement@WebCore@@QBE_NXZ
    196196        ?rangeFromLocationAndLength@TextIterator@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@PAVElement@2@HH_N@Z
    197         ?removeAllShadowRoots@ShadowTree@WebCore@@QAEXXZ
     197        ?removeAllShadowRoots@ElementShadow@WebCore@@QAEXXZ
    198198        ?remove@String@WTF@@QAEXIH@Z
    199199        ?reverseFind@StringImpl@WTF@@QAEI_WI@Z
    … …  
    223223        ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ
    224224        ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
    225         ?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ
     225        ?shadow@Element@WebCore@@QBEPAVElementShadow@2@XZ
    226226        ?substring@String@WTF@@QBE?AV12@II@Z
    227227        ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ

  • trunk/Source/autotools/symbols.filter

    r116246 r116277  
    4444_ZN7WebCore10ClientRectC1ERKNS_7IntRectE;
    4545_ZN7WebCore10ShadowRoot6createEPNS_7ElementERi;
    46 _ZN7WebCore10ShadowTree20removeAllShadowRootsEv;
     46_ZN7WebCore13ElementShadow20removeAllShadowRootsEv;
    4747_ZN7WebCore11EventTarget17toGeneratedStreamEv;
    4848_ZN7WebCore11EventTarget8toStreamEv;
    … …  
    9999_ZNK7WebCore5Frame8settingsEv;
    100100_ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE;
    101 _ZNK7WebCore7Element10shadowTreeEv;
     101_ZNK7WebCore7Element6shadowEv;
    102102_ZNK7WebCore7Element13hasShadowRootEv;
    103103_ZNK7WebCore8Document4pageEv;
Note: See TracChangeset for help on using the changeset viewer.