Changeset 91548 in webkit


Ignore:
Timestamp:
Jul 21, 2011 8:12:43 PM (13 years ago)
Author:
morrita@google.com
Message:

[Refactoring] ShadowContentSelector should be ShadowInclusionSelector
​https://bugs.webkit.org/show_bug.cgi?id=64850

Reviewed by Dimitri Glazkov.

Renamed:

  • ShadowContentSelector -> ShadowInclusionSelector
  • ShadowContentSelector::findInclusionFor -> ShadowInclusionSelector::findFor
  • ShadowContentSelector::selectInclusion -> ShadowInclusionSelector::select
  • ShadowContentSelector::unselectInclusion -> ShadowInclusionSelector::unselect
  • ShadowContentSelector::didSelectInclusion -> ShadowInclusionSelector::didSelect
  • ShadowContentSelector::willSelectInclusionOver -> ShadowInclusionSelector::willSelectOver
  • ShadowContentSelector::hasChildren -> ShadowInclusionSelector::hasCandidates

No new tests. Just a textual change.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/DOMAllInOne.cpp:
  • dom/NodeRenderingContext.cpp:
  • dom/ShadowContentElement.cpp:

(WebCore::ShadowContentElement::attach):
(WebCore::ShadowContentElement::detach):

  • dom/ShadowInclusionSelector.cpp: Renamed from Source/WebCore/dom/ShadowContentSelector.cpp.

(WebCore::ShadowInclusion::append):
(WebCore::ShadowInclusion::unlink):
(WebCore::ShadowInclusionList::ShadowInclusionList):
(WebCore::ShadowInclusionList::~ShadowInclusionList):
(WebCore::ShadowInclusionList::find):
(WebCore::ShadowInclusionList::clear):
(WebCore::ShadowInclusionList::append):
(WebCore::ShadowInclusionSelector::ShadowInclusionSelector):
(WebCore::ShadowInclusionSelector::~ShadowInclusionSelector):
(WebCore::ShadowInclusionSelector::select):
(WebCore::ShadowInclusionSelector::unselect):
(WebCore::ShadowInclusionSelector::findFor):
(WebCore::ShadowInclusionSelector::didSelect):
(WebCore::ShadowInclusionSelector::willSelectOver):

  • dom/ShadowInclusionSelector.h: Renamed from Source/WebCore/dom/ShadowContentSelector.h.

(WebCore::ShadowInclusion::includer):
(WebCore::ShadowInclusion::content):
(WebCore::ShadowInclusion::next):
(WebCore::ShadowInclusion::previous):
(WebCore::ShadowInclusion::ShadowInclusion):
(WebCore::ShadowInclusion::create):
(WebCore::ShadowInclusionList::first):
(WebCore::ShadowInclusionList::last):
(WebCore::ShadowInclusionList::isEmpty):
(WebCore::ShadowInclusionSet::add):
(WebCore::ShadowInclusionSet::remove):
(WebCore::ShadowInclusionSet::isEmpty):
(WebCore::ShadowInclusionSet::Translator::hash):
(WebCore::ShadowInclusionSet::Translator::equal):
(WebCore::ShadowInclusionSet::Hash::hash):
(WebCore::ShadowInclusionSet::Hash::equal):
(WebCore::ShadowInclusionSet::find):
(WebCore::ShadowInclusionSelector::hasCandidates):

  • dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::includerFor):
(WebCore::ShadowRoot::attach):
(WebCore::ShadowRoot::inclusions):
(WebCore::ShadowRoot::ensureInclusions):

  • dom/ShadowRoot.h:
Location:
trunk/Source/WebCore
Files:
12 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r91392 r91548  
    577577    dom/SelectorNodeList.cpp
    578578    dom/ShadowContentElement.cpp
    579     dom/ShadowContentSelector.cpp
     579    dom/ShadowInclusionSelector.cpp
    580580    dom/ShadowRoot.cpp
    581581    dom/SpaceSplitString.cpp

  • trunk/Source/WebCore/ChangeLog

    r91547 r91548  
     12011-07-21  MORITA Hajime  <morrita@google.com>
     2
     3        [Refactoring] ShadowContentSelector should be ShadowInclusionSelector
     4        https://bugs.webkit.org/show_bug.cgi?id=64850
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Renamed:
     9        - ShadowContentSelector -> ShadowInclusionSelector
     10        - ShadowContentSelector::findInclusionFor -> ShadowInclusionSelector::findFor
     11        - ShadowContentSelector::selectInclusion -> ShadowInclusionSelector::select
     12        - ShadowContentSelector::unselectInclusion -> ShadowInclusionSelector::unselect
     13        - ShadowContentSelector::didSelectInclusion -> ShadowInclusionSelector::didSelect
     14        - ShadowContentSelector::willSelectInclusionOver -> ShadowInclusionSelector::willSelectOver
     15        - ShadowContentSelector::hasChildren -> ShadowInclusionSelector::hasCandidates
     16       
     17        No new tests. Just a textual change.
     18
     19        * CMakeLists.txt:
     20        * GNUmakefile.list.am:
     21        * WebCore.gypi:
     22        * WebCore.pro:
     23        * WebCore.vcproj/WebCore.vcproj:
     24        * WebCore.xcodeproj/project.pbxproj:
     25        * dom/DOMAllInOne.cpp:
     26        * dom/NodeRenderingContext.cpp:
     27        * dom/ShadowContentElement.cpp:
     28        (WebCore::ShadowContentElement::attach):
     29        (WebCore::ShadowContentElement::detach):
     30        * dom/ShadowInclusionSelector.cpp: Renamed from Source/WebCore/dom/ShadowContentSelector.cpp.
     31        (WebCore::ShadowInclusion::append):
     32        (WebCore::ShadowInclusion::unlink):
     33        (WebCore::ShadowInclusionList::ShadowInclusionList):
     34        (WebCore::ShadowInclusionList::~ShadowInclusionList):
     35        (WebCore::ShadowInclusionList::find):
     36        (WebCore::ShadowInclusionList::clear):
     37        (WebCore::ShadowInclusionList::append):
     38        (WebCore::ShadowInclusionSelector::ShadowInclusionSelector):
     39        (WebCore::ShadowInclusionSelector::~ShadowInclusionSelector):
     40        (WebCore::ShadowInclusionSelector::select):
     41        (WebCore::ShadowInclusionSelector::unselect):
     42        (WebCore::ShadowInclusionSelector::findFor):
     43        (WebCore::ShadowInclusionSelector::didSelect):
     44        (WebCore::ShadowInclusionSelector::willSelectOver):
     45        * dom/ShadowInclusionSelector.h: Renamed from Source/WebCore/dom/ShadowContentSelector.h.
     46        (WebCore::ShadowInclusion::includer):
     47        (WebCore::ShadowInclusion::content):
     48        (WebCore::ShadowInclusion::next):
     49        (WebCore::ShadowInclusion::previous):
     50        (WebCore::ShadowInclusion::ShadowInclusion):
     51        (WebCore::ShadowInclusion::create):
     52        (WebCore::ShadowInclusionList::first):
     53        (WebCore::ShadowInclusionList::last):
     54        (WebCore::ShadowInclusionList::isEmpty):
     55        (WebCore::ShadowInclusionSet::add):
     56        (WebCore::ShadowInclusionSet::remove):
     57        (WebCore::ShadowInclusionSet::isEmpty):
     58        (WebCore::ShadowInclusionSet::Translator::hash):
     59        (WebCore::ShadowInclusionSet::Translator::equal):
     60        (WebCore::ShadowInclusionSet::Hash::hash):
     61        (WebCore::ShadowInclusionSet::Hash::equal):
     62        (WebCore::ShadowInclusionSet::find):
     63        (WebCore::ShadowInclusionSelector::hasCandidates):
     64        * dom/ShadowRoot.cpp:
     65        (WebCore::ShadowRoot::includerFor):
     66        (WebCore::ShadowRoot::attach):
     67        (WebCore::ShadowRoot::inclusions):
     68        (WebCore::ShadowRoot::ensureInclusions):
     69        * dom/ShadowRoot.h:
     70
    1712011-07-21  Robin Qiu  <robin.qiu.dev@gmail.com>
    272

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

    r91455 r91548  
    12741274        Source/WebCore/dom/ShadowContentElement.cpp \
    12751275        Source/WebCore/dom/ShadowContentElement.h \
    1276         Source/WebCore/dom/ShadowContentSelector.cpp \
    1277         Source/WebCore/dom/ShadowContentSelector.h \
     1276        Source/WebCore/dom/ShadowInclusionSelector.cpp \
     1277        Source/WebCore/dom/ShadowInclusionSelector.h \
    12781278        Source/WebCore/dom/ShadowRoot.cpp \
    12791279        Source/WebCore/dom/ShadowRoot.h \

  • trunk/Source/WebCore/WebCore.gypi

    r91455 r91548  
    25942594            'dom/ShadowContentElement.cpp',
    25952595            'dom/ShadowContentElement.h',
    2596             'dom/ShadowContentSelector.cpp',
    2597             'dom/ShadowContentSelector.h',
     2596            'dom/ShadowInclusionSelector.cpp',
     2597            'dom/ShadowInclusionSelector.h',
    25982598            'dom/ShadowRoot.cpp',
    25992599            'dom/ShadowRoot.h',

  • trunk/Source/WebCore/WebCore.pro

    r91455 r91548  
    539539    dom/SelectorNodeList.cpp \
    540540    dom/ShadowContentElement.cpp \
    541     dom/ShadowContentSelector.cpp \
     541    dom/ShadowInclusionSelector.cpp \
    542542    dom/ShadowRoot.cpp \
    543543    dom/SpaceSplitString.cpp \
    … …  
    15221522    dom/SelectorNodeList.h \
    15231523    dom/ShadowContentElement.h \
    1524     dom/ShadowContentSelector.h \
     1524    dom/ShadowInclusionSelector.h \
    15251525    dom/ShadowRoot.h \
    15261526    dom/SpaceSplitString.h \

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r91455 r91548  
    4815148151                        </File>
    4815248152                        <File
    48153                                 RelativePath="..\dom\ShadowContentSelector.cpp"
    48154                                 >
    48155                                 <FileConfiguration
    48156                                         Name="Debug|Win32"
    48157                                         ExcludedFromBuild="true"
    48158                                         >
    48159                                         <Tool
    48160                                                 Name="VCCLCompilerTool"
    48161                                         />
    48162                                 </FileConfiguration>
    48163                                 <FileConfiguration
    48164                                         Name="Release|Win32"
    48165                                         ExcludedFromBuild="true"
    48166                                         >
    48167                                         <Tool
    48168                                                 Name="VCCLCompilerTool"
    48169                                         />
    48170                                 </FileConfiguration>
    48171                                 <FileConfiguration
    48172                                         Name="Debug_Cairo_CFLite|Win32"
    48173                                         ExcludedFromBuild="true"
    48174                                         >
    48175                                         <Tool
    48176                                                 Name="VCCLCompilerTool"
    48177                                         />
    48178                                 </FileConfiguration>
    48179                                 <FileConfiguration
    48180                                         Name="Release_Cairo_CFLite|Win32"
    48181                                         ExcludedFromBuild="true"
    48182                                         >
    48183                                         <Tool
    48184                                                 Name="VCCLCompilerTool"
    48185                                         />
    48186                                 </FileConfiguration>
    48187                                 <FileConfiguration
    48188                                         Name="Debug_All|Win32"
    48189                                         ExcludedFromBuild="true"
    48190                                         >
    48191                                         <Tool
    48192                                                 Name="VCCLCompilerTool"
    48193                                         />
    48194                                 </FileConfiguration>
    48195                                 <FileConfiguration
    48196                                         Name="Production|Win32"
    48197                                         ExcludedFromBuild="true"
    48198                                         >
    48199                                         <Tool
    48200                                                 Name="VCCLCompilerTool"
    48201                                         />
    48202                                 </FileConfiguration>
    48203                         </File>
    48204                         <File
    48205                                 RelativePath="..\dom\ShadowContentSelector.h"
     48153                                RelativePath="..\dom\ShadowInclusionSelector.cpp"
     48154                                >
     48155                                <FileConfiguration
     48156                                        Name="Debug|Win32"
     48157                                        ExcludedFromBuild="true"
     48158                                        >
     48159                                        <Tool
     48160                                                Name="VCCLCompilerTool"
     48161                                        />
     48162                                </FileConfiguration>
     48163                                <FileConfiguration
     48164                                        Name="Release|Win32"
     48165                                        ExcludedFromBuild="true"
     48166                                        >
     48167                                        <Tool
     48168                                                Name="VCCLCompilerTool"
     48169                                        />
     48170                                </FileConfiguration>
     48171                                <FileConfiguration
     48172                                        Name="Debug_Cairo_CFLite|Win32"
     48173                                        ExcludedFromBuild="true"
     48174                                        >
     48175                                        <Tool
     48176                                                Name="VCCLCompilerTool"
     48177                                        />
     48178                                </FileConfiguration>
     48179                                <FileConfiguration
     48180                                        Name="Release_Cairo_CFLite|Win32"
     48181                                        ExcludedFromBuild="true"
     48182                                        >
     48183                                        <Tool
     48184                                                Name="VCCLCompilerTool"
     48185                                        />
     48186                                </FileConfiguration>
     48187                                <FileConfiguration
     48188                                        Name="Debug_All|Win32"
     48189                                        ExcludedFromBuild="true"
     48190                                        >
     48191                                        <Tool
     48192                                                Name="VCCLCompilerTool"
     48193                                        />
     48194                                </FileConfiguration>
     48195                                <FileConfiguration
     48196                                        Name="Production|Win32"
     48197                                        ExcludedFromBuild="true"
     48198                                        >
     48199                                        <Tool
     48200                                                Name="VCCLCompilerTool"
     48201                                        />
     48202                                </FileConfiguration>
     48203                        </File>
     48204                        <File
     48205                                RelativePath="..\dom\ShadowInclusionSelector.h"
    4820648206                                >
    4820748207                        </File>

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

    r91485 r91548  
    33313331                A718760E0B2A120100A16ECE /* DragActions.h in Headers */ = {isa = PBXBuildFile; fileRef = A718760D0B2A120100A16ECE /* DragActions.h */; settings = {ATTRIBUTES = (Private, ); }; };
    33323332                A71878900B2D04AC00A16ECE /* DragControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */; };
    3333                 A71C30B81381265E00DBC351 /* ShadowContentSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */; };
    3334                 A71C30B91381265E00DBC351 /* ShadowContentSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A71C30B71381265E00DBC351 /* ShadowContentSelector.h */; };
     3333                A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */; };
     3334                A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */; };
    33353335                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
    33363336                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    99009900                A718788F0B2D04AC00A16ECE /* DragControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DragControllerMac.mm; sourceTree = "<group>"; };
    99019901                A71A70C911AFB02000989D6D /* HTMLMeterElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLMeterElement.idl; sourceTree = "<group>"; };
    9902                 A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowContentSelector.cpp; sourceTree = "<group>"; };
    9903                 A71C30B71381265E00DBC351 /* ShadowContentSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowContentSelector.h; sourceTree = "<group>"; };
     9902                A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowInclusionSelector.cpp; sourceTree = "<group>"; };
     9903                A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowInclusionSelector.h; sourceTree = "<group>"; };
    99049904                A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; };
    99059905                A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
    … …  
    1988319883                                A766CF8B13810E0C0011A0B3 /* ShadowContentElement.cpp */,
    1988419884                                A74C2D3B13811E0D00F83572 /* ShadowContentElement.h */,
    19885                                 A71C30B61381265E00DBC351 /* ShadowContentSelector.cpp */,
    19886                                 A71C30B71381265E00DBC351 /* ShadowContentSelector.h */,
     19885                                A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */,
     19886                                A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */,
    1988719887                                A6D169611346B49B000EB770 /* ShadowRoot.cpp */,
    1988819888                                A6D169631346B4C1000EB770 /* ShadowRoot.h */,
    … …  
    2265322653                                0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */,
    2265422654                                A74C2D3C13811E0D00F83572 /* ShadowContentElement.h in Headers */,
    22655                                 A71C30B91381265E00DBC351 /* ShadowContentSelector.h in Headers */,
     22655                                A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */,
    2265622656                                BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
    2265722657                                A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
    … …  
    2556325563                                0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */,
    2556425564                                A766CF8C13810E0C0011A0B3 /* ShadowContentElement.cpp in Sources */,
    25565                                 A71C30B81381265E00DBC351 /* ShadowContentSelector.cpp in Sources */,
     25565                                A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */,
    2556625566                                BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */,
    2556725567                                A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */,

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

    r91364 r91548  
    116116#include "SelectorNodeList.cpp"
    117117#include "ShadowContentElement.cpp"
    118 #include "ShadowContentSelector.cpp"
     118#include "ShadowInclusionSelector.cpp"
    119119#include "ShadowRoot.cpp"
    120120#include "SpaceSplitString.cpp"

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

    r91453 r91548  
    3232#include "RenderObject.h"
    3333#include "ShadowContentElement.h"
    34 #include "ShadowContentSelector.h"
     34#include "ShadowInclusionSelector.h"
    3535#include "ShadowRoot.h"
    3636

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

    r91453 r91548  
    2929
    3030#include "HTMLNames.h"
    31 #include "ShadowContentSelector.h"
     31#include "ShadowInclusionSelector.h"
    3232#include "ShadowRoot.h"
    3333
    … …  
    5656
    5757    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
    58         ShadowContentSelector* selector = root->ensureInclusions();
    59         selector->unselectInclusion(m_inclusions.get());
    60         selector->selectInclusion(this, m_inclusions.get());
     58        ShadowInclusionSelector* selector = root->ensureInclusions();
     59        selector->unselect(m_inclusions.get());
     60        selector->select(this, m_inclusions.get());
    6161        for (ShadowInclusion* inclusion = m_inclusions->first(); inclusion; inclusion = inclusion->next())
    6262            inclusion->content()->detach();
    … …  
    6969{
    7070    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
    71         if (ShadowContentSelector* selector = root->inclusions())
    72             selector->unselectInclusion(m_inclusions.get());
     71        if (ShadowInclusionSelector* selector = root->inclusions())
     72            selector->unselect(m_inclusions.get());
    7373    }
    7474

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

    r91547 r91548  
    2626
    2727#include "config.h"
    28 #include "ShadowContentSelector.h"
     28#include "ShadowInclusionSelector.h"
    2929
    3030#include "ShadowContentElement.h"
    … …  
    9999}
    100100
    101 ShadowContentSelector::ShadowContentSelector()
     101ShadowInclusionSelector::ShadowInclusionSelector()
    102102{
    103103}
    104104
    105 ShadowContentSelector::~ShadowContentSelector()
     105ShadowInclusionSelector::~ShadowInclusionSelector()
    106106{
    107     ASSERT(m_children.isEmpty());
     107    ASSERT(m_candidates.isEmpty());
    108108}
    109109
    110 void ShadowContentSelector::selectInclusion(ShadowContentElement* contentElement, ShadowInclusionList* inclusions)
     110void ShadowInclusionSelector::select(ShadowContentElement* contentElement, ShadowInclusionList* inclusions)
    111111{
    112112    ASSERT(inclusions->isEmpty());
    113113
    114     for (size_t i = 0; i < m_children.size(); ++i) {
    115         Node* child = m_children[i].get();
     114    for (size_t i = 0; i < m_candidates.size(); ++i) {
     115        Node* child = m_candidates[i].get();
    116116        if (!child)
    117117            continue;
    … …  
    122122        inclusions->append(inclusion);
    123123        m_inclusionSet.add(inclusion.get());
    124         m_children[i] = 0;
     124        m_candidates[i] = 0;
    125125    }
    126126}
    127127
    128 void ShadowContentSelector::unselectInclusion(ShadowInclusionList* list)
     128void ShadowInclusionSelector::unselect(ShadowInclusionList* list)
    129129{
    130130    for (ShadowInclusion* inclusion = list->first(); inclusion; inclusion = inclusion->next())
    … …  
    133133}
    134134
    135 ShadowInclusion* ShadowContentSelector::findInclusionFor(Node* key) const
     135ShadowInclusion* ShadowInclusionSelector::findFor(Node* key) const
    136136{
    137137    return m_inclusionSet.find(key);
    138138}
    139139
    140 void ShadowContentSelector::didSelectInclusion()
     140void ShadowInclusionSelector::didSelect()
    141141{
    142     m_children.clear();
     142    m_candidates.clear();
    143143}
    144144
    145 void ShadowContentSelector::willSelectInclusionOver(ShadowRoot* scope)
     145void ShadowInclusionSelector::willSelectOver(ShadowRoot* scope)
    146146{
    147     if (!m_children.isEmpty())
     147    if (!m_candidates.isEmpty())
    148148        return;
    149149    for (Node* node = scope->shadowHost()->firstChild(); node; node = node->nextSibling())
    150         m_children.append(node);
     150        m_candidates.append(node);
    151151}
    152152

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

    r91547 r91548  
    2929 */
    3030
    31 #ifndef ShadowContentSelector_h
    32 #define ShadowContentSelector_h
     31#ifndef ShadowInclusionSelector_h
     32#define ShadowInclusionSelector_h
    3333
    3434#include <wtf/Forward.h>
    … …  
    124124}
    125125
    126 class ShadowContentSelector {
    127     WTF_MAKE_NONCOPYABLE(ShadowContentSelector);
     126class ShadowInclusionSelector {
     127    WTF_MAKE_NONCOPYABLE(ShadowInclusionSelector);
    128128public:
    129     ShadowContentSelector();
    130     ~ShadowContentSelector();
     129    ShadowInclusionSelector();
     130    ~ShadowInclusionSelector();
    131131
    132     void selectInclusion(ShadowContentElement*, ShadowInclusionList*);
    133     void unselectInclusion(ShadowInclusionList*);
    134     ShadowInclusion* findInclusionFor(Node* key) const;
     132    void select(ShadowContentElement*, ShadowInclusionList*);
     133    void unselect(ShadowInclusionList*);
     134    ShadowInclusion* findFor(Node* key) const;
    135135
    136     void willSelectInclusionOver(ShadowRoot*);
    137     void didSelectInclusion();
    138     bool hasChildren() const { return !m_children.isEmpty(); }
     136    void willSelectOver(ShadowRoot*);
     137    void didSelect();
     138    bool hasCandidates() const { return !m_candidates.isEmpty(); }
    139139
    140140
    … …  
    143143    void addToSet(ShadowInclusionList*);
    144144
    145     Vector<RefPtr<Node> > m_children;
     145    Vector<RefPtr<Node> > m_candidates;
    146146    ShadowInclusionSet m_inclusionSet;
    147147};

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

    r91453 r91548  
    3232#include "NodeRareData.h"
    3333#include "ShadowContentElement.h"
    34 #include "ShadowContentSelector.h"
     34#include "ShadowInclusionSelector.h"
    3535
    3636namespace WebCore {
    … …  
    101101    if (!m_inclusions)
    102102        return 0;
    103     ShadowInclusion* found = m_inclusions->findInclusionFor(node);
     103    ShadowInclusion* found = m_inclusions->findFor(node);
    104104    if (!found)
    105105        return 0;
    … …  
    140140    // ensureInclusions(), and here we just ensure that
    141141    // it is in clean state.
    142     ASSERT(!m_inclusions || !m_inclusions->hasChildren());
     142    ASSERT(!m_inclusions || !m_inclusions->hasCandidates());
    143143    TreeScope::attach();
    144144    if (m_inclusions)
    145         m_inclusions->didSelectInclusion();
     145        m_inclusions->didSelect();
    146146}
    147147
    148 ShadowContentSelector* ShadowRoot::inclusions() const
     148ShadowInclusionSelector* ShadowRoot::inclusions() const
    149149{
    150150    return m_inclusions.get();
    151151}
    152152
    153 ShadowContentSelector* ShadowRoot::ensureInclusions()
     153ShadowInclusionSelector* ShadowRoot::ensureInclusions()
    154154{
    155155    if (!m_inclusions)
    156         m_inclusions = adoptPtr(new ShadowContentSelector());
    157     m_inclusions->willSelectInclusionOver(this);
     156        m_inclusions = adoptPtr(new ShadowInclusionSelector());
     157    m_inclusions->willSelectOver(this);
    158158    return m_inclusions.get();
    159159}

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

    r91453 r91548  
    3434class Document;
    3535class ShadowContentElement;
    36 class ShadowContentSelector;
     36class ShadowInclusionSelector;
    3737
    3838class ShadowRoot : public TreeScope {
    … …  
    5050    void setApplyAuthorSheets(bool);
    5151
    52     ShadowContentSelector* inclusions() const;
    53     ShadowContentSelector* ensureInclusions();
     52    ShadowInclusionSelector* inclusions() const;
     53    ShadowInclusionSelector* ensureInclusions();
    5454
    5555private:
    … …  
    6565
    6666    bool m_applyAuthorSheets;
    67     OwnPtr<ShadowContentSelector> m_inclusions;
     67    OwnPtr<ShadowInclusionSelector> m_inclusions;
    6868};
    6969
Note: See TracChangeset for help on using the changeset viewer.