⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 134693 in webkit


Ignore:
Timestamp:
Nov 14, 2012, 4:48:05 PM (14 years ago)
Author:
tony@chromium.org
Message:

Convert m_selectorVector back to a stack allocated m_reusableSelectorVector
​https://bugs.webkit.org/show_bug.cgi?id=102295

Reviewed by Andreas Kling.

Revert r125252 because we're not going to go forward with implementing CSS hierarchies at this time.

No new tests because there should be no change in behavior.

  • css/CSSGrammar.y.in:
  • css/CSSParser.cpp:

(WebCore::CSSParser::CSSParser):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseColor):
(WebCore::CSSParser::parseDeclaration):
(WebCore):
(WebCore::filterProperties):
(WebCore::CSSParser::createStylePropertySet):
(WebCore::CSSParser::addProperty):
(WebCore::CSSParser::rollbackLastProperties):
(WebCore::CSSParser::clearProperties):
(WebCore::CSSParser::parse4Values):
(WebCore::CSSParser::parseFlowThread):
(WebCore::CSSParser::addTextDecorationProperty):
(WebCore::CSSParser::createFloatingSelectorVector):
(WebCore::CSSParser::sinkFloatingSelectorVector):
(WebCore::CSSParser::createStyleRule):
(WebCore::CSSParser::createFontFaceRule):
(WebCore::CSSParser::createPageRule):
(WebCore::CSSParser::setReusableRegionSelectorVector):
(WebCore::CSSParser::startDeclarationsForMarginBox):
(WebCore::CSSParser::endDeclarationsForMarginBox):
(WebCore::CSSParser::deleteFontFaceOnlyValues):

  • css/CSSParser.h:

(WebCore::CSSParser::hasProperties):
(WebCore::CSSParser::reusableSelectorVector):
(CSSParser):
(WebCore::CSSParser::reusableRegionSelectorVector):

  • css/CSSParserValues.cpp:

(WebCore::CSSParserSelector::adoptSelectorVector):

  • css/CSSParserValues.h:

(CSSParserSelector):

  • css/CSSSelectorList.cpp:

(WebCore::CSSSelectorList::adoptSelectorVector):

  • css/CSSSelectorList.h:

(CSSSelectorList):

  • css/SVGCSSParser.cpp:

(WebCore::CSSParser::parseSVGValue):

  • css/StyleRule.cpp:

(WebCore::StyleRuleRegion::StyleRuleRegion):

  • css/StyleRule.h:

(WebCore::StyleRule::parserAdoptSelectorVector):
(WebCore::StyleRulePage::parserAdoptSelectorVector):
(WebCore::StyleRuleRegion::create):
(StyleRuleRegion):

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r134691 r134693  
     12012-11-14  Tony Chang  <tony@chromium.org>
     2
     3        Convert m_selectorVector back to a stack allocated m_reusableSelectorVector
     4        https://bugs.webkit.org/show_bug.cgi?id=102295
     5
     6        Reviewed by Andreas Kling.
     7
     8        Revert r125252 because we're not going to go forward with implementing CSS hierarchies at this time.
     9
     10        No new tests because there should be no change in behavior.
     11
     12        * css/CSSGrammar.y.in:
     13        * css/CSSParser.cpp:
     14        (WebCore::CSSParser::CSSParser):
     15        (WebCore::CSSParser::parseValue):
     16        (WebCore::CSSParser::parseColor):
     17        (WebCore::CSSParser::parseDeclaration):
     18        (WebCore):
     19        (WebCore::filterProperties):
     20        (WebCore::CSSParser::createStylePropertySet):
     21        (WebCore::CSSParser::addProperty):
     22        (WebCore::CSSParser::rollbackLastProperties):
     23        (WebCore::CSSParser::clearProperties):
     24        (WebCore::CSSParser::parse4Values):
     25        (WebCore::CSSParser::parseFlowThread):
     26        (WebCore::CSSParser::addTextDecorationProperty):
     27        (WebCore::CSSParser::createFloatingSelectorVector):
     28        (WebCore::CSSParser::sinkFloatingSelectorVector):
     29        (WebCore::CSSParser::createStyleRule):
     30        (WebCore::CSSParser::createFontFaceRule):
     31        (WebCore::CSSParser::createPageRule):
     32        (WebCore::CSSParser::setReusableRegionSelectorVector):
     33        (WebCore::CSSParser::startDeclarationsForMarginBox):
     34        (WebCore::CSSParser::endDeclarationsForMarginBox):
     35        (WebCore::CSSParser::deleteFontFaceOnlyValues):
     36        * css/CSSParser.h:
     37        (WebCore::CSSParser::hasProperties):
     38        (WebCore::CSSParser::reusableSelectorVector):
     39        (CSSParser):
     40        (WebCore::CSSParser::reusableRegionSelectorVector):
     41        * css/CSSParserValues.cpp:
     42        (WebCore::CSSParserSelector::adoptSelectorVector):
     43        * css/CSSParserValues.h:
     44        (CSSParserSelector):
     45        * css/CSSSelectorList.cpp:
     46        (WebCore::CSSSelectorList::adoptSelectorVector):
     47        * css/CSSSelectorList.h:
     48        (CSSSelectorList):
     49        * css/SVGCSSParser.cpp:
     50        (WebCore::CSSParser::parseSVGValue):
     51        * css/StyleRule.cpp:
     52        (WebCore::StyleRuleRegion::StyleRuleRegion):
     53        * css/StyleRule.h:
     54        (WebCore::StyleRule::parserAdoptSelectorVector):
     55        (WebCore::StyleRulePage::parserAdoptSelectorVector):
     56        (WebCore::StyleRuleRegion::create):
     57        (StyleRuleRegion):
     58
    1592012-11-14  Alec Flett  <alecflett@chromium.org>
    260

  • trunk/Source/WebCore/css/CSSGrammar.y.in

    r133577 r134693  
    3737    Vector<RefPtr<StyleRuleBase> >* ruleList;
    3838    CSSParserSelector* selector;
    39     CSSSelectorVector* selectorList;
     39    Vector<OwnPtr<CSSParserSelector> >* selectorList;
    4040    CSSSelector::MarginBoxType marginBox;
    4141    CSSSelector::Relation relation;
    … …  
    325325        if ($4) {
    326326            parser->m_valueList = parser->sinkFloatingValueList($4);
    327             int oldParsedProperties = parser->m_parsedProperties->size();
     327            int oldParsedProperties = parser->m_parsedProperties.size();
    328328            if (!parser->parseValue(parser->m_id, parser->m_important))
    329                 parser->rollbackLastProperties(parser->m_parsedProperties->size() - oldParsedProperties);
     329                parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
    330330            parser->m_valueList = nullptr;
    331331        }
    … …  
    10391039    selector %prec UNIMPORTANT_TOK {
    10401040        if ($1) {
    1041             $$ = parser->selectorVector();
     1041            $$ = parser->reusableSelectorVector();
    10421042            $$->shrink(0);
    10431043            $$->append(parser->sinkFloatingSelector($1));
    … …  
    13761376            $$->setMatch(CSSSelector::PseudoClass);
    13771377
    1378             CSSSelectorVector selectorVector;
     1378            Vector<OwnPtr<CSSParserSelector> > selectorVector;
    13791379            selectorVector.append(parser->sinkFloatingSelector($4));
    13801380            $$->adoptSelectorVector(selectorVector);
    … …  
    14621462        if ($1 && $4) {
    14631463            parser->m_valueList = parser->sinkFloatingValueList($4);
    1464             int oldParsedProperties = parser->m_parsedProperties->size();
     1464            int oldParsedProperties = parser->m_parsedProperties.size();
    14651465            $$ = parser->parseValue(static_cast<CSSPropertyID>($1), $5);
    14661466            if (!$$)
    1467                 parser->rollbackLastProperties(parser->m_parsedProperties->size() - oldParsedProperties);
     1467                parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
    14681468            else
    14691469                isPropertyParsed = true;

  • trunk/Source/WebCore/css/CSSParser.cpp

    r134483 r134693  
    249249    , m_id(CSSPropertyInvalid)
    250250    , m_styleSheet(0)
    251     , m_parsedProperties(adoptPtr(new ParsedPropertyVector))
    252251    , m_selectorListForParseSelector(0)
    253252    , m_numParsedPropertiesBeforeMarginBox(INVALID_NUM_PARSED_PROPERTIES)
    … …  
    274273    , m_inViewport(false)
    275274#endif
    276     , m_selectorVector(adoptPtr(new CSSSelectorVector))
    277275{
    278276#if YYDEBUG > 0
    … …  
    12321230    if (m_hasFontFaceOnlyValues)
    12331231        deleteFontFaceOnlyValues();
    1234     if (!m_parsedProperties->isEmpty()) {
     1232    if (!m_parsedProperties.isEmpty()) {
    12351233        ok = true;
    1236         declaration->addParsedProperties(*m_parsedProperties);
     1234        declaration->addParsedProperties(m_parsedProperties);
    12371235        clearProperties();
    12381236    }
    … …  
    12551253        return false;
    12561254
    1257     CSSValue* value = parser.m_parsedProperties->first().value();
     1255    CSSValue* value = parser.m_parsedProperties.first().value();
    12581256    if (!value->isPrimitiveValue())
    12591257        return false;
    … …  
    12731271    m_rule = 0;
    12741272
    1275     return !m_parsedProperties->isEmpty() && m_parsedProperties->first().id() == CSSPropertyColor;
     1273    return !m_parsedProperties.isEmpty() && m_parsedProperties.first().id() == CSSPropertyColor;
    12761274}
    12771275
    … …  
    13461344    if (m_hasFontFaceOnlyValues)
    13471345        deleteFontFaceOnlyValues();
    1348     if (!m_parsedProperties->isEmpty()) {
     1346    if (!m_parsedProperties.isEmpty()) {
    13491347        ok = true;
    1350         declaration->addParsedProperties(*m_parsedProperties);
     1348        declaration->addParsedProperties(m_parsedProperties);
    13511349        clearProperties();
    13521350    }
    … …  
    13851383
    13861384#if ENABLE(CSS_VARIABLES)
    1387 static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector* input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenVariables)
     1385static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenVariables)
    13881386#else
    1389 static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector* input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
     1387static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
    13901388#endif
    13911389{
    13921390    // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
    1393     for (int i = input->size() - 1; i >= 0; --i) {
    1394         const CSSProperty& property = input->at(i);
     1391    for (int i = input.size() - 1; i >= 0; --i) {
     1392        const CSSProperty& property = input[i];
    13951393        if (property.isImportant() != important)
    13961394            continue;
    … …  
    14161414{
    14171415    BitArray<numCSSProperties> seenProperties;
    1418     size_t unusedEntries = m_parsedProperties->size();
     1416    size_t unusedEntries = m_parsedProperties.size();
    14191417    Vector<CSSProperty, 256> results(unusedEntries);
    14201418
    … …  
    14221420#if ENABLE(CSS_VARIABLES)
    14231421    HashSet<AtomicString> seenVariables;
    1424     filterProperties(true, m_parsedProperties.get(), results, unusedEntries, seenProperties, seenVariables);
    1425     filterProperties(false, m_parsedProperties.get(), results, unusedEntries, seenProperties, seenVariables);
     1422    filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties, seenVariables);
     1423    filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties, seenVariables);
    14261424#else
    1427     filterProperties(true, m_parsedProperties.get(), results, unusedEntries, seenProperties);
    1428     filterProperties(false, m_parsedProperties.get(), results, unusedEntries, seenProperties);
     1425    filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties);
     1426    filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties);
    14291427#endif
    14301428    if (unusedEntries)
    … …  
    14361434void CSSParser::addProperty(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important, bool implicit)
    14371435{
    1438     m_parsedProperties->append(CSSProperty(propId, value, important, m_currentShorthand, m_implicitShorthand || implicit));
     1436    m_parsedProperties.append(CSSProperty(propId, value, important, m_currentShorthand, m_implicitShorthand || implicit));
    14391437}
    14401438
    … …  
    14421440{
    14431441    ASSERT(num >= 0);
    1444     ASSERT(m_parsedProperties->size() >= static_cast<unsigned>(num));
    1445     m_parsedProperties->shrink(m_parsedProperties->size() - num);
     1442    ASSERT(m_parsedProperties.size() >= static_cast<unsigned>(num));
     1443    m_parsedProperties.shrink(m_parsedProperties.size() - num);
    14461444}
    14471445
    14481446void CSSParser::clearProperties()
    14491447{
    1450     m_parsedProperties->clear();
     1448    m_parsedProperties.clear();
    14511449    m_numParsedPropertiesBeforeMarginBox = INVALID_NUM_PARSED_PROPERTIES;
    14521450    m_hasFontFaceOnlyValues = false;
    … …  
    17821780            overflowXValue = cssValuePool().createIdentifierValue(CSSValueAuto);
    17831781        else
    1784             overflowXValue = m_parsedProperties->last().value();
     1782            overflowXValue = m_parsedProperties.last().value();
    17851783        addProperty(CSSPropertyOverflowX, overflowXValue.release(), important);
    17861784        return true;
    … …  
    18051803            if (!parseValue(CSSPropertyWebkitBorderHorizontalSpacing, important))
    18061804                return false;
    1807             CSSValue* value = m_parsedProperties->last().value();
     1805            CSSValue* value = m_parsedProperties.last().value();
    18081806            addProperty(CSSPropertyWebkitBorderVerticalSpacing, value, important);
    18091807            return true;
    … …  
    24542452            if (!parseValue(webkitMarginCollapseShorthand().properties()[0], important))
    24552453                return false;
    2456             CSSValue* value = m_parsedProperties->last().value();
     2454            CSSValue* value = m_parsedProperties.last().value();
    24572455            addProperty(webkitMarginCollapseShorthand().properties()[1], value, important);
    24582456            return true;
    … …  
    32963294            if (!parseValue(properties[0], important))
    32973295                return false;
    3298             CSSValue* value = m_parsedProperties->last().value();
     3296            CSSValue* value = m_parsedProperties.last().value();
    32993297            ImplicitScope implicitScope(this, PropertyImplicit);
    33003298            addProperty(properties[1], value, important);
    … …  
    33063304            if (!parseValue(properties[0], important) || !parseValue(properties[1], important))
    33073305                return false;
    3308             CSSValue* value = m_parsedProperties->at(m_parsedProperties->size() - 2).value();
     3306            CSSValue* value = m_parsedProperties[m_parsedProperties.size() - 2].value();
    33093307            ImplicitScope implicitScope(this, PropertyImplicit);
    33103308            addProperty(properties[2], value, important);
    3311             value = m_parsedProperties->at(m_parsedProperties->size() - 2).value();
     3309            value = m_parsedProperties[m_parsedProperties.size() - 2].value();
    33123310            addProperty(properties[3], value, important);
    33133311            break;
    … …  
    33163314            if (!parseValue(properties[0], important) || !parseValue(properties[1], important) || !parseValue(properties[2], important))
    33173315                return false;
    3318             CSSValue* value = m_parsedProperties->at(m_parsedProperties->size() - 2).value();
     3316            CSSValue* value = m_parsedProperties[m_parsedProperties.size() - 2].value();
    33193317            ImplicitScope implicitScope(this, PropertyImplicit);
    33203318            addProperty(properties[3], value, important);
    … …  
    80768074    m_rule = 0;
    80778075
    8078     return ((m_parsedProperties->size() == 1) && (m_parsedProperties->first().id() == CSSPropertyWebkitFlowInto));
     8076    return ((m_parsedProperties.size() == 1) && (m_parsedProperties.first().id() == CSSPropertyWebkitFlowInto));
    80798077}
    80808078
    … …  
    82278225    // The text-decoration-line property takes priority over text-decoration, unless the latter has important priority set.
    82288226    if (propId == CSSPropertyTextDecoration && !important && m_currentShorthand == CSSPropertyInvalid) {
    8229         for (unsigned i = 0; i < m_parsedProperties->size(); ++i) {
    8230             if (m_parsedProperties->at(i).id() == CSSPropertyWebkitTextDecorationLine)
     8227        for (unsigned i = 0; i < m_parsedProperties.size(); ++i) {
     8228            if (m_parsedProperties[i].id() == CSSPropertyWebkitTextDecorationLine)
    82318229                return;
    82328230        }
    … …  
    99769974}
    99779975
    9978 CSSSelectorVector* CSSParser::createFloatingSelectorVector()
    9979 {
    9980     CSSSelectorVector* selectorVector = new CSSSelectorVector;
     9976Vector<OwnPtr<CSSParserSelector> >* CSSParser::createFloatingSelectorVector()
     9977{
     9978    Vector<OwnPtr<CSSParserSelector> >* selectorVector = new Vector<OwnPtr<CSSParserSelector> >;
    99819979    m_floatingSelectorVectors.add(selectorVector);
    99829980    return selectorVector;
    99839981}
    99849982
    9985 PassOwnPtr<CSSSelectorVector > CSSParser::sinkFloatingSelectorVector(CSSSelectorVector* selectorVector)
     9983PassOwnPtr<Vector<OwnPtr<CSSParserSelector> > > CSSParser::sinkFloatingSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectorVector)
    99869984{
    99879985    if (selectorVector) {
    … …  
    1017910177}
    1018010178
    10181 StyleRuleBase* CSSParser::createStyleRule(CSSSelectorVector* selectors)
     10179StyleRuleBase* CSSParser::createStyleRule(Vector<OwnPtr<CSSParserSelector> >* selectors)
    1018210180{
    1018310181    StyleRule* result = 0;
    … …  
    1020110199{
    1020210200    m_allowImportRules = m_allowNamespaceDeclarations = false;
    10203     for (unsigned i = 0; i < m_parsedProperties->size(); ++i) {
    10204         CSSProperty& property = m_parsedProperties->at(i);
     10201    for (unsigned i = 0; i < m_parsedProperties.size(); ++i) {
     10202        CSSProperty& property = m_parsedProperties[i];
    1020510203        if (property.id() == CSSPropertyFontVariant && property.value()->isPrimitiveValue())
    1020610204            property.wrapValueInCommaSeparatedList();
    … …  
    1031210310    if (pageSelector) {
    1031310311        RefPtr<StyleRulePage> rule = StyleRulePage::create();
    10314         CSSSelectorVector selectorVector;
     10312        Vector<OwnPtr<CSSParserSelector> > selectorVector;
    1031510313        selectorVector.append(pageSelector);
    1031610314        rule->parserAdoptSelectorVector(selectorVector);
    … …  
    1032510323}
    1032610324
    10327 void CSSParser::setReusableRegionSelectorVector(CSSSelectorVector* selectors)
     10325void CSSParser::setReusableRegionSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectors)
    1032810326{
    1032910327    if (selectors)
    … …  
    1036310361void CSSParser::startDeclarationsForMarginBox()
    1036410362{
    10365     m_numParsedPropertiesBeforeMarginBox = m_parsedProperties->size();
     10363    m_numParsedPropertiesBeforeMarginBox = m_parsedProperties.size();
    1036610364}
    1036710365
    1036810366void CSSParser::endDeclarationsForMarginBox()
    1036910367{
    10370     rollbackLastProperties(m_parsedProperties->size() - m_numParsedPropertiesBeforeMarginBox);
     10368    rollbackLastProperties(m_parsedProperties.size() - m_numParsedPropertiesBeforeMarginBox);
    1037110369    m_numParsedPropertiesBeforeMarginBox = INVALID_NUM_PARSED_PROPERTIES;
    1037210370}
    … …  
    1037510373{
    1037610374    ASSERT(m_hasFontFaceOnlyValues);
    10377     for (unsigned i = 0; i < m_parsedProperties->size();) {
    10378         CSSProperty& property = m_parsedProperties->at(i);
     10375    for (unsigned i = 0; i < m_parsedProperties.size();) {
     10376        CSSProperty& property = m_parsedProperties[i];
    1037910377        if (property.id() == CSSPropertyFontVariant && property.value()->isValueList()) {
    10380             m_parsedProperties->remove(i);
     10378            m_parsedProperties.remove(i);
    1038110379            continue;
    1038210380        }

  • trunk/Source/WebCore/css/CSSParser.h

    r134483 r134693  
    9292    void addProperty(CSSPropertyID, PassRefPtr<CSSValue>, bool important, bool implicit = false);
    9393    void rollbackLastProperties(int num);
    94     bool hasProperties() const { return !m_parsedProperties->isEmpty(); }
     94    bool hasProperties() const { return !m_parsedProperties.isEmpty(); }
    9595
    9696    bool parseValue(CSSPropertyID, bool important);
    … …  
    258258    PassOwnPtr<CSSParserSelector> sinkFloatingSelector(CSSParserSelector*);
    259259
    260     CSSSelectorVector* createFloatingSelectorVector();
    261     PassOwnPtr<CSSSelectorVector> sinkFloatingSelectorVector(CSSSelectorVector*);
     260    Vector<OwnPtr<CSSParserSelector> >* createFloatingSelectorVector();
     261    PassOwnPtr<Vector<OwnPtr<CSSParserSelector> > > sinkFloatingSelectorVector(Vector<OwnPtr<CSSParserSelector> >*);
    262262
    263263    CSSParserValueList* createFloatingValueList();
    … …  
    277277    StyleRuleBase* createMediaRule(MediaQuerySet*, RuleList*);
    278278    RuleList* createRuleList();
    279     StyleRuleBase* createStyleRule(CSSSelectorVector* selectors);
     279    StyleRuleBase* createStyleRule(Vector<OwnPtr<CSSParserSelector> >* selectors);
    280280    StyleRuleBase* createFontFaceRule();
    281281    StyleRuleBase* createPageRule(PassOwnPtr<CSSParserSelector> pageSelector);
    282     StyleRuleBase* createRegionRule(CSSSelectorVector* regionSelector, RuleList* rules);
     282    StyleRuleBase* createRegionRule(Vector<OwnPtr<CSSParserSelector> >* regionSelector, RuleList* rules);
    283283    StyleRuleBase* createMarginAtRule(CSSSelector::MarginBoxType);
    284284#if ENABLE(SHADOW_DOM)
    … …  
    306306    void invalidBlockHit();
    307307
    308     CSSSelectorVector* selectorVector() { return m_selectorVector.get(); }
    309 
    310     void setReusableRegionSelectorVector(CSSSelectorVector* selectors);
    311     CSSSelectorVector* reusableRegionSelectorVector() { return &m_reusableRegionSelectorVector; }
     308    Vector<OwnPtr<CSSParserSelector> >* reusableSelectorVector() { return &m_reusableSelectorVector; }
     309
     310    void setReusableRegionSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectors);
     311    Vector<OwnPtr<CSSParserSelector> >* reusableRegionSelectorVector() { return &m_reusableRegionSelectorVector; }
    312312
    313313    void updateLastSelectorLineAndPosition();
    … …  
    327327    OwnPtr<MediaQuery> m_mediaQuery;
    328328    OwnPtr<CSSParserValueList> m_valueList;
    329 
    330329    typedef Vector<CSSProperty, 256> ParsedPropertyVector;
    331     OwnPtr<ParsedPropertyVector> m_parsedProperties;
     330    ParsedPropertyVector m_parsedProperties;
    332331    CSSSelectorList* m_selectorListForParseSelector;
    333332
    … …  
    539538    Vector<OwnPtr<RuleList> > m_parsedRuleLists;
    540539    HashSet<CSSParserSelector*> m_floatingSelectors;
    541     HashSet<CSSSelectorVector*> m_floatingSelectorVectors;
     540    HashSet<Vector<OwnPtr<CSSParserSelector> >*> m_floatingSelectorVectors;
    542541    HashSet<CSSParserValueList*> m_floatingValueLists;
    543542    HashSet<CSSParserFunction*> m_floatingFunctions;
    … …  
    549548    OwnPtr<Vector<RefPtr<StyleKeyframe> > > m_floatingKeyframeVector;
    550549
    551     OwnPtr<CSSSelectorVector> m_selectorVector;
    552     CSSSelectorVector m_reusableRegionSelectorVector;
     550    Vector<OwnPtr<CSSParserSelector> > m_reusableSelectorVector;
     551    Vector<OwnPtr<CSSParserSelector> > m_reusableRegionSelectorVector;
    553552
    554553    RefPtr<CSSCalcValue> m_parsedCalculation;

  • trunk/Source/WebCore/css/CSSParserValues.cpp

    r130829 r134693  
    165165}
    166166
    167 void CSSParserSelector::adoptSelectorVector(CSSSelectorVector& selectorVector)
     167void CSSParserSelector::adoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectorVector)
    168168{
    169169    CSSSelectorList* selectorList = fastNew<CSSSelectorList>();

  • trunk/Source/WebCore/css/CSSParserValues.h

    r133577 r134693  
    169169};
    170170
    171 class CSSParserSelector;
    172 
    173 typedef Vector<OwnPtr<CSSParserSelector> > CSSSelectorVector;
    174 
    175171class CSSParserSelector {
    176172    WTF_MAKE_FAST_ALLOCATED;
    … …  
    189185    void setForPage() { m_selector->setForPage(); }
    190186
    191     void adoptSelectorVector(CSSSelectorVector&);
     187    void adoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectorVector);
    192188
    193189    CSSSelector::PseudoType pseudoType() const { return m_selector->pseudoType(); }

  • trunk/Source/WebCore/css/CSSSelectorList.cpp

    r133577 r134693  
    5959}
    6060
    61 void CSSSelectorList::adoptSelectorVector(CSSSelectorVector& selectorVector)
     61void CSSSelectorList::adoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectorVector)
    6262{
    6363    deleteSelectors();

  • trunk/Source/WebCore/css/CSSSelectorList.h

    r133577 r134693  
    2727#define CSSSelectorList_h
    2828
    29 #include "CSSParserValues.h"
    3029#include "CSSSelector.h"
    3130
    … …  
    4342
    4443    void adopt(CSSSelectorList& list);
    45     void adoptSelectorVector(CSSSelectorVector&);
     44    void adoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectorVector);
    4645
    4746    CSSSelector* first() const { return m_selectorArray ? m_selectorArray : 0; }

  • trunk/Source/WebCore/css/SVGCSSParser.cpp

    r132786 r134693  
    286286            return false;
    287287        }
    288         CSSValue* value = m_parsedProperties->last().value();
     288        CSSValue* value = m_parsedProperties.last().value();
    289289        addProperty(CSSPropertyMarkerMid, value, important);
    290290        addProperty(CSSPropertyMarkerEnd, value, important);

  • trunk/Source/WebCore/css/StyleRule.cpp

    r133084 r134693  
    393393}
    394394
    395 StyleRuleRegion::StyleRuleRegion(CSSSelectorVector* selectors, Vector<RefPtr<StyleRuleBase> >& adoptRules)
     395StyleRuleRegion::StyleRuleRegion(Vector<OwnPtr<CSSParserSelector> >* selectors, Vector<RefPtr<StyleRuleBase> >& adoptRules)
    396396    : StyleRuleBlock(Region, adoptRules)
    397397{

  • trunk/Source/WebCore/css/StyleRule.h

    r133084 r134693  
    110110    StylePropertySet* mutableProperties();
    111111   
    112     void parserAdoptSelectorVector(CSSSelectorVector& selectors) { m_selectorList.adoptSelectorVector(selectors); }
     112    void parserAdoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectors) { m_selectorList.adoptSelectorVector(selectors); }
    113113    void wrapperAdoptSelectorList(CSSSelectorList& selectors) { m_selectorList.adopt(selectors); }
    114114    void setProperties(PassRefPtr<StylePropertySet>);
    … …  
    159159    StylePropertySet* mutableProperties();
    160160
    161     void parserAdoptSelectorVector(CSSSelectorVector& selectors) { m_selectorList.adoptSelectorVector(selectors); }
     161    void parserAdoptSelectorVector(Vector<OwnPtr<CSSParserSelector> >& selectors) { m_selectorList.adoptSelectorVector(selectors); }
    162162    void wrapperAdoptSelectorList(CSSSelectorList& selectors) { m_selectorList.adopt(selectors); }
    163163    void setProperties(PassRefPtr<StylePropertySet>);
    … …  
    214214class StyleRuleRegion : public StyleRuleBlock {
    215215public:
    216     static PassRefPtr<StyleRuleRegion> create(CSSSelectorVector* selectors, Vector<RefPtr<StyleRuleBase> >& adoptRules)
     216    static PassRefPtr<StyleRuleRegion> create(Vector<OwnPtr<CSSParserSelector> >* selectors, Vector<RefPtr<StyleRuleBase> >& adoptRules)
    217217    {
    218218        return adoptRef(new StyleRuleRegion(selectors, adoptRules));
    … …  
    226226
    227227private:
    228     StyleRuleRegion(CSSSelectorVector*, Vector<RefPtr<StyleRuleBase> >& adoptRules);
     228    StyleRuleRegion(Vector<OwnPtr<CSSParserSelector> >*, Vector<RefPtr<StyleRuleBase> >& adoptRules);
    229229    StyleRuleRegion(const StyleRuleRegion&);
    230230   
Note: See TracChangeset for help on using the changeset viewer.