Changeset 108959 in webkit
- Timestamp:
- Feb 26, 2012 10:50:19 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 40 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r108953 r108959 1 2012-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 1 10 2012-02-26 Chang Wan Hong <jourmoon@company100.net> 2 11 -
trunk/Source/WebCore/CMakeLists.txt
r108958 r108959 616 616 dom/SelectorQuery.cpp 617 617 dom/ShadowRoot.cpp 618 dom/Shadow RootList.cpp618 dom/ShadowTree.cpp 619 619 dom/SpaceSplitString.cpp 620 620 dom/StaticHashSetNodeList.cpp -
trunk/Source/WebCore/ChangeLog
r108958 r108959 1 2012-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 1 138 2012-02-26 Adam Barth <abarth@webkit.org> 2 139 -
trunk/Source/WebCore/GNUmakefile.list.am
r108958 r108959 1739 1739 Source/WebCore/dom/ShadowRoot.cpp \ 1740 1740 Source/WebCore/dom/ShadowRoot.h \ 1741 Source/WebCore/dom/Shadow RootList.cpp \1742 Source/WebCore/dom/Shadow RootList.h \1741 Source/WebCore/dom/ShadowTree.cpp \ 1742 Source/WebCore/dom/ShadowTree.h \ 1743 1743 Source/WebCore/dom/SpaceSplitString.cpp \ 1744 1744 Source/WebCore/dom/SpaceSplitString.h \ -
trunk/Source/WebCore/Target.pri
r108958 r108959 572 572 dom/SelectorQuery.cpp \ 573 573 dom/ShadowRoot.cpp \ 574 dom/Shadow RootList.cpp \574 dom/ShadowTree.cpp \ 575 575 dom/SpaceSplitString.cpp \ 576 576 dom/StaticNodeList.cpp \ … … 1691 1691 dom/SelectorQuery.h \ 1692 1692 dom/ShadowRoot.h \ 1693 dom/Shadow RootList.h \1693 dom/ShadowTree.h \ 1694 1694 dom/SpaceSplitString.h \ 1695 1695 dom/StaticNodeList.h \ -
trunk/Source/WebCore/WebCore.exp.in
r108957 r108959 1448 1448 __ZNK7WebCore6Widget9frameRectEv 1449 1449 __ZNK7WebCore7Element10screenRectEv 1450 __ZNK7WebCore7Element10shadowTreeEv 1450 1451 __ZNK7WebCore7Element12getAttributeERKNS_13QualifiedNameE 1451 1452 __ZNK7WebCore7Element13hasShadowRootEv 1452 __ZNK7WebCore7Element14shadowRootListEv1453 1453 __ZNK7WebCore7IntRect10intersectsERKS0_ 1454 1454 __ZNK7WebCore7IntRect8containsERKS0_ -
trunk/Source/WebCore/WebCore.gypi
r108958 r108959 620 620 'dom/ScriptRunner.h', 621 621 'dom/ShadowRoot.h', 622 'dom/Shadow RootList.h',622 'dom/ShadowTree.h', 623 623 'dom/SpaceSplitString.h', 624 624 'dom/StyledElement.h', … … 5151 5151 'dom/ShadowRoot.cpp', 5152 5152 'dom/ShadowRoot.h', 5153 'dom/Shadow RootList.cpp',5154 'dom/Shadow RootList.h',5153 'dom/ShadowTree.cpp', 5154 'dom/ShadowTree.h', 5155 5155 'dom/SpaceSplitString.cpp', 5156 5156 'dom/StaticHashSetNodeList.cpp', -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r108958 r108959 1594 1594 550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; }; 1595 1595 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 */; };1598 1596 573D134714CE39FF0057ABCA /* InspectorTypeBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorTypeBuilder.cpp */; }; 1599 1597 57B791A314C6A62900F202D1 /* HTMLContentSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* HTMLContentSelector.cpp */; }; … … 1605 1603 57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; }; 1606 1604 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 */; }; 1607 1607 5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; }; 1608 1608 5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; }; … … 8481 8481 550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 8482 8482 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>"; };8485 8483 573D134514CE39FF0057ABCA /* InspectorTypeBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTypeBuilder.cpp; sourceTree = "<group>"; }; 8486 8484 573D134614CE39FF0057ABCA /* InspectorTypeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTypeBuilder.h; sourceTree = "<group>"; }; … … 8493 8491 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; }; 8494 8492 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>"; }; 8495 8495 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTreeViewer.cpp; sourceTree = "<group>"; }; 8496 8496 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = "<group>"; }; … … 14464 14464 A715E650134BBBEC00D8E713 /* ProgressShadowElement.cpp */, 14465 14465 A715E651134BBBEC00D8E713 /* ProgressShadowElement.h */, 14466 572E92F914E540580087FFBA /* ShadowRootList.cpp */,14467 572E92FA14E540580087FFBA /* ShadowRootList.h */,14468 14466 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */, 14469 14467 4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */, … … 20863 20861 A6D169631346B4C1000EB770 /* ShadowRoot.h */, 20864 20862 A7DB418114CE1F0A00A2E316 /* ShadowRoot.idl */, 20863 57CF4C8414F7597A00ECFF14 /* ShadowTree.cpp */, 20864 57CF4C8514F7597A00ECFF14 /* ShadowTree.h */, 20865 20865 D01A27AB10C9BFD800026A42 /* SpaceSplitString.cpp */, 20866 20866 D01A27AC10C9BFD800026A42 /* SpaceSplitString.h */, … … 23751 23751 BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */, 23752 23752 A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */, 23753 57 2E92FC14E540580087FFBA /* ShadowRootList.h in Headers */,23753 57CF4C8714F7597A00ECFF14 /* ShadowTree.h in Headers */, 23754 23754 A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */, 23755 23755 B2AFFC940D00A5DF0030074D /* ShapeArabic.h in Headers */, … … 26827 26827 BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */, 26828 26828 A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */, 26829 57 2E92FB14E540580087FFBA /* ShadowRootList.cpp in Sources */,26829 57CF4C8614F7597A00ECFF14 /* ShadowTree.cpp in Sources */, 26830 26830 A80E6CF40A1989CA007FB8C5 /* ShadowValue.cpp in Sources */, 26831 26831 B2AFFC930D00A5DF0030074D /* ShapeArabic.c in Sources */, -
trunk/Source/WebCore/dom/DOMAllInOne.cpp
r108954 r108959 119 119 #include "SelectorQuery.cpp" 120 120 #include "ShadowRoot.cpp" 121 #include "Shadow RootList.cpp"121 #include "ShadowTree.cpp" 122 122 #include "SpaceSplitString.cpp" 123 123 #include "StaticHashSetNodeList.cpp" -
trunk/Source/WebCore/dom/Document.cpp
r108832 r108959 142 142 #include "Settings.h" 143 143 #include "ShadowRoot.h" 144 #include "Shadow RootList.h"144 #include "ShadowTree.h" 145 145 #include "StaticHashSetNodeList.h" 146 146 #include "StyleSheetList.h" … … 674 674 675 675 if (element->hasShadowRoot()) { 676 for (ShadowRoot* root = element->shadow RootList()->youngestShadowRoot(); root; root = root->olderShadowRoot())676 for (ShadowRoot* root = element->shadowTree()->youngestShadowRoot(); root; root = root->olderShadowRoot()) 677 677 buildAccessKeyMap(root); 678 678 } -
trunk/Source/WebCore/dom/Element.cpp
r108758 r108959 848 848 setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false); 849 849 #endif 850 if (Shadow RootList* shadowRoots = shadowRootList())851 shadowRoots->willRemove();850 if (ShadowTree* tree = shadowTree()) 851 tree->willRemove(); 852 852 ContainerNode::willRemove(); 853 853 } … … 858 858 // by the time we reach updateId 859 859 ContainerNode::insertedIntoDocument(); 860 if (Shadow RootList* shadowRoots = shadowRootList())861 shadowRoots->insertedIntoDocument();860 if (ShadowTree* tree = shadowTree()) 861 tree->insertedIntoDocument(); 862 862 863 863 if (m_attributeMap) { … … 891 891 892 892 ContainerNode::removedFromDocument(); 893 if (Shadow RootList* shadowRoots = shadowRootList())894 shadowRoots->removedFromDocument();893 if (ShadowTree* tree = shadowTree()) 894 tree->removedFromDocument(); 895 895 } 896 896 … … 900 900 if (!deep) 901 901 return; 902 if (Shadow RootList* shadowRoots = shadowRootList())903 shadowRoots->insertedIntoTree(true);902 if (ShadowTree* tree = shadowTree()) 903 tree->insertedIntoTree(true); 904 904 905 905 #if ENABLE(FULLSCREEN_API) … … 914 914 if (!deep) 915 915 return; 916 if (Shadow RootList* shadowRoots = shadowRootList())917 shadowRoots->removedFromTree(true);916 if (ShadowTree* tree = shadowTree()) 917 tree->removedFromTree(true); 918 918 } 919 919 … … 929 929 if (hasShadowRoot()) { 930 930 parentPusher.push(); 931 shadow RootList()->attach();931 shadowTree()->attach(); 932 932 933 933 // In a shadow tree, some of light children may be attached by 'content' element. … … 966 966 rareData()->resetComputedStyle(); 967 967 ContainerNode::detach(); 968 if (Shadow RootList* shadowRoots = shadowRootList())969 shadowRoots->detach();968 if (ShadowTree* tree = shadowTree()) 969 tree->detach(); 970 970 971 971 RenderWidget::resumeWidgetHierarchyUpdates(); … … 1127 1127 // FIXME: This does not care about sibling combinators. Will be necessary in XBL2 world. 1128 1128 if (hasShadowRoot()) { 1129 Shadow RootList* list = shadowRootList();1130 if (change >= Inherit || list->childNeedsStyleRecalc() || list->needsStyleRecalc()) {1129 ShadowTree* tree = shadowTree(); 1130 if (change >= Inherit || tree->childNeedsStyleRecalc() || tree->needsStyleRecalc()) { 1131 1131 parentPusher.push(); 1132 list->recalcShadowTreeStyle(change);1132 tree->recalcShadowTreeStyle(change); 1133 1133 } 1134 1134 } … … 1143 1143 bool Element::hasShadowRoot() const 1144 1144 { 1145 if (Shadow RootList* list = shadowRootList())1146 return list->hasShadowRoot();1145 if (ShadowTree* tree = shadowTree()) 1146 return tree->hasShadowRoot(); 1147 1147 return false; 1148 1148 } 1149 1149 1150 Shadow RootList* Element::shadowRootList() const1150 ShadowTree* Element::shadowTree() const 1151 1151 { 1152 1152 if (!hasRareData()) 1153 1153 return 0; 1154 1154 1155 return &rareData()->m_shadow RootList;1155 return &rareData()->m_shadowTree; 1156 1156 } 1157 1157 … … 1185 1185 1186 1186 shadowRoot->setShadowHost(this); 1187 shadow RootList()->pushShadowRoot(shadowRoot.get());1187 shadowTree()->pushShadowRoot(shadowRoot.get()); 1188 1188 1189 1189 if (inDocument()) … … 1199 1199 { 1200 1200 if (hasShadowRoot()) 1201 return shadow RootList()->oldestShadowRoot();1201 return shadowTree()->oldestShadowRoot(); 1202 1202 1203 1203 return ShadowRoot::create(this, ShadowRoot::CreatingUserAgentShadowRoot).get(); … … 1209 1209 return; 1210 1210 1211 while (RefPtr<ShadowRoot> oldRoot = shadow RootList()->popShadowRoot()) {1211 while (RefPtr<ShadowRoot> oldRoot = shadowTree()->popShadowRoot()) { 1212 1212 document()->removeFocusedNodeOfSubtree(oldRoot.get()); 1213 1213 … … 1362 1362 if (hasRareData()) { 1363 1363 if (hasShadowRoot()) 1364 shadow RootList()->hostChildrenChanged();1364 shadowTree()->hostChildrenChanged(); 1365 1365 } 1366 1366 } -
trunk/Source/WebCore/dom/Element.h
r108758 r108959 43 43 class IntSize; 44 44 class ShadowRoot; 45 class Shadow RootList;45 class ShadowTree; 46 46 class WebKitAnimationList; 47 47 … … 255 255 256 256 bool hasShadowRoot() const; 257 Shadow RootList* shadowRootList() const;258 259 // FIXME: These API will be moved to Shadow RootList.257 ShadowTree* shadowTree() const; 258 259 // FIXME: These API will be moved to ShadowTree. 260 260 // https://bugs.webkit.org/show_bug.cgi?id=78313 261 261 void setShadowRoot(PassRefPtr<ShadowRoot>, ExceptionCode&); -
trunk/Source/WebCore/dom/ElementRareData.h
r107793 r108959 28 28 #include "HTMLCollection.h" 29 29 #include "NodeRareData.h" 30 #include "Shadow RootList.h"30 #include "ShadowTree.h" 31 31 #include <wtf/OwnPtr.h> 32 32 … … 65 65 LayoutSize m_minimumSizeForResizing; 66 66 RefPtr<RenderStyle> m_computedStyle; 67 Shadow RootList m_shadowRootList;67 ShadowTree m_shadowTree; 68 68 AtomicString m_shadowPseudoId; 69 69 … … 95 95 inline ElementRareData::~ElementRareData() 96 96 { 97 ASSERT(!m_shadow RootList.hasShadowRoot());97 ASSERT(!m_shadowTree.hasShadowRoot()); 98 98 } 99 99 -
trunk/Source/WebCore/dom/Node.cpp
r108770 r108959 87 87 #include "SelectorQuery.h" 88 88 #include "ShadowRoot.h" 89 #include "Shadow RootList.h"89 #include "ShadowTree.h" 90 90 #include "StaticNodeList.h" 91 91 #include "StorageEvent.h" … … 812 812 inline static ShadowRoot* oldestShadowRootFor(const Node* node) 813 813 { 814 return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadow RootList()->oldestShadowRoot() : 0;814 return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->oldestShadowRoot() : 0; 815 815 } 816 816 -
trunk/Source/WebCore/dom/NodeRenderingContext.cpp
r108758 r108959 36 36 #include "RenderView.h" 37 37 #include "ShadowRoot.h" 38 #include "Shadow RootList.h"38 #include "ShadowTree.h" 39 39 40 40 #if ENABLE(SVG) … … 48 48 , m_node(node) 49 49 , m_parentNodeForRenderingAndStyle(0) 50 , m_visualParentShadow RootList(0)50 , m_visualParentShadowTree(0) 51 51 , m_insertionPoint(0) 52 52 , m_style(0) … … 65 65 if (parent->isElementNode()) { 66 66 if (toElement(parent)->hasShadowRoot()) { 67 m_visualParentShadow RootList = toElement(parent)->shadowRootList();68 if ((m_insertionPoint = m_visualParentShadow RootList->insertionPointFor(m_node))69 && m_visualParentShadow RootList->isSelectorActive()) {67 m_visualParentShadowTree = toElement(parent)->shadowTree(); 68 if ((m_insertionPoint = m_visualParentShadowTree->insertionPointFor(m_node)) 69 && m_visualParentShadowTree->isSelectorActive()) { 70 70 m_phase = AttachingDistributed; 71 71 m_parentNodeForRenderingAndStyle = NodeRenderingContext(m_insertionPoint).parentNodeForRenderingAndStyle(); … … 96 96 , m_node(node) 97 97 , m_parentNodeForRenderingAndStyle(0) 98 , m_visualParentShadow RootList(0)98 , m_visualParentShadowTree(0) 99 99 , m_insertionPoint(0) 100 100 , m_style(style) … … 262 262 { 263 263 if (m_phase == AttachingNotDistributed) 264 m_visualParentShadow RootList->hostChildrenChanged();264 m_visualParentShadowTree->hostChildrenChanged(); 265 265 } 266 266 -
trunk/Source/WebCore/dom/NodeRenderingContext.h
r108758 r108959 40 40 class RenderObject; 41 41 class RenderStyle; 42 class Shadow RootList;42 class ShadowTree; 43 43 44 44 class NodeRenderingContext { … … 83 83 Node* m_node; 84 84 ContainerNode* m_parentNodeForRenderingAndStyle; 85 Shadow RootList* m_visualParentShadowRootList;85 ShadowTree* m_visualParentShadowTree; 86 86 InsertionPoint* m_insertionPoint; 87 87 RefPtr<RenderStyle> m_style; -
trunk/Source/WebCore/dom/ShadowRoot.cpp
r108713 r108959 35 35 #include "InsertionPoint.h" 36 36 #include "NodeRareData.h" 37 #include "Shadow RootList.h"37 #include "ShadowTree.h" 38 38 #include "SVGNames.h" 39 39 … … 158 158 } 159 159 160 Shadow RootList* ShadowRoot::list() const160 ShadowTree* ShadowRoot::tree() const 161 161 { 162 162 if (host()) 163 return host()->shadow RootList();163 return host()->shadowTree(); 164 164 return 0; 165 165 } … … 191 191 // it is in clean state. 192 192 // FIXME: This assertion breaks if multiple shadow roots are being attached. 193 // Shadow RootListshould 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()); 195 195 DocumentFragment::attach(); 196 if (HTMLContentSelector* selector = host()->shadowRootList()->selector())196 if (HTMLContentSelector* selector = tree()->selector()) 197 197 selector->didSelect(); 198 198 } -
trunk/Source/WebCore/dom/ShadowRoot.h
r108770 r108959 39 39 class HTMLContentSelector; 40 40 class InsertionPoint; 41 class Shadow RootList;41 class ShadowTree; 42 42 43 43 class ShadowRoot : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> { … … 71 71 72 72 Element* host() const { return shadowHost(); } 73 Shadow RootList* list() const;73 ShadowTree* tree() const; 74 74 75 75 ShadowRoot* youngerShadowRoot() const { return prev(); } -
trunk/Source/WebCore/dom/ShadowTree.cpp
r108958 r108959 26 26 27 27 #include "config.h" 28 #include "Shadow RootList.h"28 #include "ShadowTree.h" 29 29 30 30 #include "Document.h" … … 37 37 namespace WebCore { 38 38 39 Shadow RootList::ShadowRootList()39 ShadowTree::ShadowTree() 40 40 : m_needsRecalculateContent(false) 41 41 { 42 42 } 43 43 44 Shadow RootList::~ShadowRootList()44 ShadowTree::~ShadowTree() 45 45 { 46 46 ASSERT(!hasShadowRoot()); 47 47 } 48 48 49 void Shadow RootList::pushShadowRoot(ShadowRoot* shadowRoot)49 void ShadowTree::pushShadowRoot(ShadowRoot* shadowRoot) 50 50 { 51 51 #if ENABLE(SHADOW_DOM) … … 59 59 } 60 60 61 ShadowRoot* Shadow RootList::popShadowRoot()61 ShadowRoot* ShadowTree::popShadowRoot() 62 62 { 63 63 if (!hasShadowRoot()) … … 67 67 } 68 68 69 void Shadow RootList::insertedIntoDocument()69 void ShadowTree::insertedIntoDocument() 70 70 { 71 71 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) … … 73 73 } 74 74 75 void Shadow RootList::removedFromDocument()75 void ShadowTree::removedFromDocument() 76 76 { 77 77 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) … … 79 79 } 80 80 81 void Shadow RootList::insertedIntoTree(bool deep)81 void ShadowTree::insertedIntoTree(bool deep) 82 82 { 83 83 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) … … 85 85 } 86 86 87 void Shadow RootList::removedFromTree(bool deep)87 void ShadowTree::removedFromTree(bool deep) 88 88 { 89 89 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) … … 91 91 } 92 92 93 void Shadow RootList::willRemove()93 void ShadowTree::willRemove() 94 94 { 95 95 for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) … … 97 97 } 98 98 99 void Shadow RootList::attach()99 void ShadowTree::attach() 100 100 { 101 101 // FIXME: Currently we only support the case that the shadow root list has at most one shadow root. … … 109 109 } 110 110 111 void Shadow RootList::detach()111 void ShadowTree::detach() 112 112 { 113 113 // FIXME: Currently we only support the case that the shadow root list has at most one shadow root. … … 121 121 } 122 122 123 InsertionPoint* Shadow RootList::insertionPointFor(Node* node) const123 InsertionPoint* ShadowTree::insertionPointFor(Node* node) const 124 124 { 125 125 if (!m_selector) … … 131 131 } 132 132 133 bool Shadow RootList::isSelectorActive() const133 bool ShadowTree::isSelectorActive() const 134 134 { 135 135 return m_selector && m_selector->hasCandidates(); 136 136 } 137 137 138 void Shadow RootList::reattach()138 void ShadowTree::reattach() 139 139 { 140 140 detach(); … … 142 142 } 143 143 144 bool Shadow RootList::childNeedsStyleRecalc()144 bool ShadowTree::childNeedsStyleRecalc() 145 145 { 146 146 ASSERT(youngestShadowRoot()); … … 151 151 } 152 152 153 bool Shadow RootList::needsStyleRecalc()153 bool ShadowTree::needsStyleRecalc() 154 154 { 155 155 ASSERT(youngestShadowRoot()); … … 160 160 } 161 161 162 void Shadow RootList::recalcShadowTreeStyle(Node::StyleChange change)162 void ShadowTree::recalcShadowTreeStyle(Node::StyleChange change) 163 163 { 164 164 ShadowRoot* youngest = youngestShadowRoot(); … … 184 184 } 185 185 186 bool Shadow RootList::needsReattachHostChildrenAndShadow()186 bool ShadowTree::needsReattachHostChildrenAndShadow() 187 187 { 188 188 return m_needsRecalculateContent || (youngestShadowRoot() && youngestShadowRoot()->hasContentElement()); 189 189 } 190 190 191 void Shadow RootList::hostChildrenChanged()191 void ShadowTree::hostChildrenChanged() 192 192 { 193 193 ASSERT(youngestShadowRoot()); … … 200 200 } 201 201 202 void Shadow RootList::setNeedsReattachHostChildrenAndShadow()202 void ShadowTree::setNeedsReattachHostChildrenAndShadow() 203 203 { 204 204 m_needsRecalculateContent = true; … … 207 207 } 208 208 209 void Shadow RootList::reattachHostChildrenAndShadow()209 void ShadowTree::reattachHostChildrenAndShadow() 210 210 { 211 211 ASSERT(youngestShadowRoot()); … … 228 228 } 229 229 230 HTMLContentSelector* Shadow RootList::ensureSelector()230 HTMLContentSelector* ShadowTree::ensureSelector() 231 231 { 232 232 if (!m_selector) -
trunk/Source/WebCore/dom/ShadowTree.h
r108958 r108959 25 25 */ 26 26 27 #ifndef Shadow RootList_h28 #define Shadow RootList_h27 #ifndef ShadowTree_h 28 #define ShadowTree_h 29 29 30 30 #include "ShadowRoot.h" … … 41 41 class InsertionPoint; 42 42 43 class Shadow RootList{43 class ShadowTree { 44 44 public: 45 Shadow RootList();46 ~Shadow RootList();45 ShadowTree(); 46 ~ShadowTree(); 47 47 48 48 bool hasShadowRoot() const; … … 85 85 OwnPtr<HTMLContentSelector> m_selector; 86 86 bool m_needsRecalculateContent : 1; 87 WTF_MAKE_NONCOPYABLE(Shadow RootList);87 WTF_MAKE_NONCOPYABLE(ShadowTree); 88 88 }; 89 89 90 inline bool Shadow RootList::hasShadowRoot() const90 inline bool ShadowTree::hasShadowRoot() const 91 91 { 92 92 return !m_shadowRoots.isEmpty(); 93 93 } 94 94 95 inline ShadowRoot* Shadow RootList::youngestShadowRoot() const95 inline ShadowRoot* ShadowTree::youngestShadowRoot() const 96 96 { 97 97 return m_shadowRoots.head(); 98 98 } 99 99 100 inline ShadowRoot* Shadow RootList::oldestShadowRoot() const100 inline ShadowRoot* ShadowTree::oldestShadowRoot() const 101 101 { 102 102 return m_shadowRoots.tail(); 103 103 } 104 104 105 inline HTMLContentSelector* Shadow RootList::selector() const105 inline HTMLContentSelector* ShadowTree::selector() const 106 106 { 107 107 return m_selector.get(); 108 108 } 109 109 110 inline void Shadow RootList::clearNeedsReattachHostChildrenAndShadow()110 inline void ShadowTree::clearNeedsReattachHostChildrenAndShadow() 111 111 { 112 112 m_needsRecalculateContent = false; 113 113 } 114 114 115 inline Element* Shadow RootList::host() const115 inline Element* ShadowTree::host() const 116 116 { 117 117 ASSERT(hasShadowRoot()); -
trunk/Source/WebCore/dom/TreeScopeAdopter.cpp
r107706 r108959 29 29 #include "NodeRareData.h" 30 30 #include "ShadowRoot.h" 31 #include "Shadow RootList.h"31 #include "ShadowTree.h" 32 32 33 33 namespace WebCore { … … 35 35 static inline ShadowRoot* shadowRootFor(Node* node) 36 36 { 37 return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadow RootList()->youngestShadowRoot() : 0;37 return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->youngestShadowRoot() : 0; 38 38 } 39 39 -
trunk/Source/WebCore/html/ColorInputType.cpp
r108209 r108959 117 117 wrapperElement->appendChild(colorSwatch.release(), ec); 118 118 ASSERT(!ec); 119 element()->shadow RootList()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec);119 element()->shadowTree()->oldestShadowRoot()->appendChild(wrapperElement.release(), ec); 120 120 ASSERT(!ec); 121 121 … … 186 186 HTMLElement* ColorInputType::shadowColorSwatch() const 187 187 { 188 ShadowRoot* shadow = element()->shadow RootList()->oldestShadowRoot();188 ShadowRoot* shadow = element()->shadowTree()->oldestShadowRoot(); 189 189 return shadow ? toHTMLElement(shadow->firstChild()->firstChild()) : 0; 190 190 } -
trunk/Source/WebCore/html/FileInputType.cpp
r107706 r108959 37 37 #include "ScriptController.h" 38 38 #include "ShadowRoot.h" 39 #include "Shadow RootList.h"39 #include "ShadowTree.h" 40 40 #include <wtf/PassOwnPtr.h> 41 41 #include <wtf/text/StringBuilder.h> … … 269 269 ASSERT(element()->hasShadowRoot()); 270 270 ExceptionCode ec = 0; 271 element()->shadow RootList()->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); 272 272 } 273 273 … … 275 275 { 276 276 ASSERT(element()->hasShadowRoot()); 277 UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadow RootList()->oldestShadowRoot()->firstChild());277 UploadButtonElement* button = static_cast<UploadButtonElement*>(element()->shadowTree()->oldestShadowRoot()->firstChild()); 278 278 if (button) 279 279 button->setValue(element()->multiple() ? fileButtonChooseMultipleFilesLabel() : fileButtonChooseFileLabel()); -
trunk/Source/WebCore/html/HTMLDetailsElement.cpp
r108758 r108959 32 32 #include "RenderDetails.h" 33 33 #include "ShadowRoot.h" 34 #include "Shadow RootList.h"34 #include "ShadowTree.h" 35 35 #include "Text.h" 36 36 … … 125 125 } 126 126 127 return static_cast<DetailsSummaryElement*>(shadow RootList()->oldestShadowRoot()->firstChild())->fallbackSummary();127 return static_cast<DetailsSummaryElement*>(shadowTree()->oldestShadowRoot()->firstChild())->fallbackSummary(); 128 128 } 129 129 -
trunk/Source/WebCore/html/HTMLKeygenElement.cpp
r107706 r108959 34 34 #include "SSLKeyGenerator.h" 35 35 #include "ShadowRoot.h" 36 #include "Shadow RootList.h"36 #include "ShadowTree.h" 37 37 #include "Text.h" 38 38 #include <wtf/StdLibExtras.h> … … 133 133 { 134 134 ASSERT(hasShadowRoot()); 135 ShadowRoot* shadow = shadow RootList()->oldestShadowRoot();135 ShadowRoot* shadow = shadowTree()->oldestShadowRoot(); 136 136 return shadow ? toHTMLSelectElement(shadow->firstChild()) : 0; 137 137 } -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r108831 r108959 74 74 #include "Settings.h" 75 75 #include "ShadowRoot.h" 76 #include "Shadow RootList.h"76 #include "ShadowTree.h" 77 77 #include "TimeRanges.h" 78 78 #include "UUID.h" … … 3752 3752 MediaControls* HTMLMediaElement::mediaControls() 3753 3753 { 3754 return toMediaControls(shadow RootList()->oldestShadowRoot()->firstChild());3754 return toMediaControls(shadowTree()->oldestShadowRoot()->firstChild()); 3755 3755 } 3756 3756 … … 3760 3760 return false; 3761 3761 3762 Node* node = shadow RootList()->oldestShadowRoot()->firstChild();3762 Node* node = shadowTree()->oldestShadowRoot()->firstChild(); 3763 3763 return node && node->isMediaControls(); 3764 3764 } -
trunk/Source/WebCore/html/HTMLSummaryElement.cpp
r108758 r108959 34 34 #include "RenderSummary.h" 35 35 #include "ShadowRoot.h" 36 #include "Shadow RootList.h"36 #include "ShadowTree.h" 37 37 38 38 namespace WebCore { -
trunk/Source/WebCore/html/HTMLTextAreaElement.cpp
r108345 r108959 39 39 #include "RenderTextControlMultiLine.h" 40 40 #include "ShadowRoot.h" 41 #include "Shadow RootList.h"41 #include "ShadowTree.h" 42 42 #include "Text.h" 43 43 #include "TextControlInnerElements.h" … … 295 295 HTMLElement* HTMLTextAreaElement::innerTextElement() const 296 296 { 297 Node* node = shadow RootList()->oldestShadowRoot()->firstChild();297 Node* node = shadowTree()->oldestShadowRoot()->firstChild(); 298 298 ASSERT(!node || node->hasTagName(divTag)); 299 299 return toHTMLElement(node); … … 472 472 if (placeholderText.isEmpty()) { 473 473 if (m_placeholder) { 474 shadow RootList()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec);474 shadowTree()->oldestShadowRoot()->removeChild(m_placeholder.get(), ec); 475 475 ASSERT(!ec); 476 476 m_placeholder.clear(); … … 481 481 m_placeholder = HTMLDivElement::create(document()); 482 482 m_placeholder->setShadowPseudoId("-webkit-input-placeholder"); 483 shadow RootList()->oldestShadowRoot()->insertBefore(m_placeholder, shadowRootList()->oldestShadowRoot()->firstChild()->nextSibling(), ec);483 shadowTree()->oldestShadowRoot()->insertBefore(m_placeholder, shadowTree()->oldestShadowRoot()->firstChild()->nextSibling(), ec); 484 484 ASSERT(!ec); 485 485 } -
trunk/Source/WebCore/html/InputType.cpp
r108051 r108959 57 57 #include "SearchInputType.h" 58 58 #include "ShadowRoot.h" 59 #include "Shadow RootList.h"59 #include "ShadowTree.h" 60 60 #include "SubmitInputType.h" 61 61 #include "TelephoneInputType.h" … … 383 383 return; 384 384 385 if (ShadowRoot* root = element()->shadow RootList()->oldestShadowRoot())385 if (ShadowRoot* root = element()->shadowTree()->oldestShadowRoot()) 386 386 root->removeAllChildren(); 387 387 } -
trunk/Source/WebCore/html/RangeInputType.cpp
r107706 r108959 43 43 #include "RenderSlider.h" 44 44 #include "ShadowRoot.h" 45 #include "Shadow RootList.h"45 #include "ShadowTree.h" 46 46 #include "SliderThumbElement.h" 47 47 #include "StepRange.h" … … 162 162 return; 163 163 ASSERT(element()->hasShadowRoot()); 164 if (targetNode != element() && !targetNode->isDescendantOf(element()->shadow RootList()->oldestShadowRoot()))164 if (targetNode != element() && !targetNode->isDescendantOf(element()->shadowTree()->oldestShadowRoot())) 165 165 return; 166 166 SliderThumbElement* thumb = sliderThumbElementOf(element()); … … 248 248 container->appendChild(track.release(), ec); 249 249 container->appendChild(TrackLimiterElement::create(document), ec); 250 element()->shadow RootList()->oldestShadowRoot()->appendChild(container.release(), ec);250 element()->shadowTree()->oldestShadowRoot()->appendChild(container.release(), ec); 251 251 } 252 252 -
trunk/Source/WebCore/html/TextFieldInputType.cpp
r108228 r108959 44 44 #include "RenderTheme.h" 45 45 #include "ShadowRoot.h" 46 #include "Shadow RootList.h"46 #include "ShadowTree.h" 47 47 #include "TextControlInnerElements.h" 48 48 #include "TextEvent.h" … … 227 227 m_innerText = TextControlInnerTextElement::create(document); 228 228 if (!createsContainer) { 229 element()->shadow RootList()->oldestShadowRoot()->appendChild(m_innerText, ec);230 return; 231 } 232 233 ShadowRoot* shadowRoot = element()->shadow RootList()->oldestShadowRoot();229 element()->shadowTree()->oldestShadowRoot()->appendChild(m_innerText, ec); 230 return; 231 } 232 233 ShadowRoot* shadowRoot = element()->shadowTree()->oldestShadowRoot(); 234 234 m_container = HTMLDivElement::create(document); 235 235 m_container->setShadowPseudoId("-webkit-textfield-decoration-container"); … … 393 393 m_placeholder = HTMLDivElement::create(element()->document()); 394 394 m_placeholder->setShadowPseudoId("-webkit-input-placeholder"); 395 element()->shadow RootList()->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); 396 396 ASSERT(!ec); 397 397 } -
trunk/Source/WebCore/html/ValidationMessage.cpp
r107899 r108959 45 45 #include "Settings.h" 46 46 #include "ShadowRoot.h" 47 #include "Shadow RootList.h"47 #include "ShadowTree.h" 48 48 #include "Text.h" 49 49 #include <wtf/PassOwnPtr.h> … … 188 188 HTMLElement* host = toHTMLElement(m_element); 189 189 ExceptionCode ec; 190 host->shadow RootList()->oldestShadowRoot()->removeChild(m_bubble.get(), ec);190 host->shadowTree()->oldestShadowRoot()->removeChild(m_bubble.get(), ec); 191 191 m_bubble = 0; 192 192 } -
trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp
r108713 r108959 33 33 #include "QualifiedName.h" 34 34 #include "ShadowRoot.h" 35 #include "Shadow RootList.h"35 #include "ShadowTree.h" 36 36 #include <wtf/StdLibExtras.h> 37 37 … … 75 75 // Before calling StyledElement::attach, selector must be calculated. 76 76 if (root) { 77 HTMLContentSelector* selector = root-> list()->ensureSelector();77 HTMLContentSelector* selector = root->tree()->ensureSelector(); 78 78 selector->unselect(&m_selections); 79 79 selector->select(this, &m_selections); … … 91 91 { 92 92 if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) { 93 if (HTMLContentSelector* selector = root-> list()->selector())93 if (HTMLContentSelector* selector = root->tree()->selector()) 94 94 selector->unselect(&m_selections); 95 95 96 96 // When content element is detached, shadow tree should be recreated to re-calculate selector for 97 97 // other content elements. 98 root-> list()->setNeedsReattachHostChildrenAndShadow();98 root->tree()->setNeedsReattachHostChildrenAndShadow(); 99 99 } 100 100 … … 123 123 if (attr->name() == selectAttr) { 124 124 if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) 125 root-> list()->setNeedsReattachHostChildrenAndShadow();125 root->tree()->setNeedsReattachHostChildrenAndShadow(); 126 126 } else 127 127 InsertionPoint::parseAttribute(attr); -
trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp
r107899 r108959 44 44 #include "RenderTheme.h" 45 45 #include "ShadowRoot.h" 46 #include "Shadow RootList.h"46 #include "ShadowTree.h" 47 47 #include "StepRange.h" 48 48 #include <wtf/MathExtras.h> … … 68 68 { 69 69 ASSERT(node); 70 ShadowRoot* shadow = node->toInputElement()->shadow RootList()->oldestShadowRoot();70 ShadowRoot* shadow = node->toInputElement()->shadowTree()->oldestShadowRoot(); 71 71 ASSERT(shadow); 72 72 Node* thumb = shadow->firstChild()->firstChild()->firstChild(); … … 143 143 RenderObject* trackRenderer = node()->firstChild()->renderer(); 144 144 if (!isVertical && input->renderer()->isSlider() && !inputHeight.isFixed() && !inputHeight.isPercent()) { 145 RenderObject* thumbRenderer = input->shadow RootList()->oldestShadowRoot()->firstChild()->firstChild()->firstChild()->renderer();145 RenderObject* thumbRenderer = input->shadowTree()->oldestShadowRoot()->firstChild()->firstChild()->firstChild()->renderer(); 146 146 if (thumbRenderer) { 147 147 style()->setHeight(thumbRenderer->style()->height()); … … 357 357 ASSERT(node); 358 358 ASSERT(node->toInputElement()->hasShadowRoot()); 359 ShadowRoot* shadow = node->toInputElement()->shadow RootList()->oldestShadowRoot();359 ShadowRoot* shadow = node->toInputElement()->shadowTree()->oldestShadowRoot(); 360 360 ASSERT(shadow); 361 361 Node* limiter = shadow->firstChild()->lastChild(); -
trunk/Source/WebCore/page/FocusController.cpp
r107706 r108959 55 55 #include "Settings.h" 56 56 #include "ShadowRoot.h" 57 #include "Shadow RootList.h"57 #include "ShadowTree.h" 58 58 #include "SpatialNavigation.h" 59 59 #include "Widget.h" … … 156 156 static inline ShadowRoot* shadowRoot(Node* node) 157 157 { 158 return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadow RootList()->youngestShadowRoot() : 0;158 return node->isElementNode() && toElement(node)->hasShadowRoot() ? toElement(node)->shadowTree()->youngestShadowRoot() : 0; 159 159 } 160 160 -
trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp
r108261 r108959 33 33 #include "RenderTheme.h" 34 34 #include "ShadowRoot.h" 35 #include "Shadow RootList.h"35 #include "ShadowTree.h" 36 36 #include "TextRun.h" 37 37 #include "VisiblePosition.h" … … 221 221 ASSERT(input->hasShadowRoot()); 222 222 223 Node* buttonNode = input->shadow RootList()->oldestShadowRoot()->firstChild();223 Node* buttonNode = input->shadowTree()->oldestShadowRoot()->firstChild(); 224 224 return buttonNode && buttonNode->isHTMLElement() && buttonNode->hasTagName(inputTag) ? static_cast<HTMLInputElement*>(buttonNode) : 0; 225 225 } -
trunk/Source/WebCore/svg/SVGTRefElement.cpp
r108758 r108959 33 33 #include "RenderSVGResource.h" 34 34 #include "ShadowRoot.h" 35 #include "Shadow RootList.h"35 #include "ShadowTree.h" 36 36 #include "SVGDocument.h" 37 37 #include "SVGElementInstance.h" … … 166 166 167 167 ASSERT(hasShadowRoot()); 168 ShadowRoot* root = shadow RootList()->oldestShadowRoot();168 ShadowRoot* root = shadowTree()->oldestShadowRoot(); 169 169 if (!root->firstChild()) 170 170 root->appendChild(SVGShadowText::create(document(), textContent), ASSERT_NO_EXCEPTION); … … 182 182 183 183 ASSERT(hasShadowRoot()); 184 Node* container = shadow RootList()->oldestShadowRoot()->firstChild();184 Node* container = shadowTree()->oldestShadowRoot()->firstChild(); 185 185 if (container) 186 186 container->setTextContent(emptyContent, ignore); -
trunk/Source/WebCore/testing/Internals.cpp
r108831 r108959 51 51 #include "Settings.h" 52 52 #include "ShadowRoot.h" 53 #include "Shadow RootList.h"53 #include "ShadowTree.h" 54 54 #include "SpellChecker.h" 55 55 #include "TextIterator.h" … … 204 204 205 205 if (host->hasShadowRoot()) 206 return host->shadow RootList()->youngestShadowRoot();206 return host->shadowTree()->youngestShadowRoot(); 207 207 208 208 return ShadowRoot::create(host, ec).get(); … … 226 226 return 0; 227 227 228 return host->shadow RootList()->youngestShadowRoot();228 return host->shadowTree()->youngestShadowRoot(); 229 229 } 230 230 … … 239 239 return 0; 240 240 241 return host->shadow RootList()->oldestShadowRoot();241 return host->shadowTree()->oldestShadowRoot(); 242 242 } 243 243 -
trunk/Source/WebKit2/ChangeLog
r108957 r108959 1 2012-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 1 11 2012-02-26 Hajime Morrita <morrita@chromium.org> 2 12 -
trunk/Source/WebKit2/win/WebKit2.def
r108428 r108959 191 191 ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ 192 192 ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z 193 ?shadow RootList@Element@WebCore@@QBEPAVShadowRootList@2@XZ193 ?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ 194 194 ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ 195 195 ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z -
trunk/Source/WebKit2/win/WebKit2CFLite.def
r108642 r108959 184 184 ?settings@Frame@WebCore@@QBEPAVSettings@2@XZ 185 185 ?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z 186 ?shadow RootList@Element@WebCore@@QBEPAVShadowRootList@2@XZ186 ?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ 187 187 ?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ 188 188 ?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z -
trunk/Source/autotools/symbols.filter
r108428 r108959 80 80 _ZNK7WebCore5Frame8settingsEv; 81 81 _ZNK7WebCore6JSNode21pushEventHandlerScopeEPN3JSC9ExecStateEPNS1_14ScopeChainNodeE; 82 _ZNK7WebCore7Element10shadowTreeEv; 82 83 _ZNK7WebCore7Element13hasShadowRootEv; 83 _ZNK7WebCore7Element14shadowRootListEv;84 84 _ZNK7WebCore8Document4pageEv; 85 85 _ZNK7WebCore8Document8settingsEv;
Note: See TracChangeset
for help on using the changeset viewer.