Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: Source/core/css/CSSParser.cpp

Issue 106423003: [oilpan] Rename visit to mark. (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Fix typo Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 8530 matching lines...) Expand 10 before | Expand all | Expand 10 after
8541 8541
8542 addProperty(CSSPropertySrc, srcList, m_important); 8542 addProperty(CSSPropertySrc, srcList, m_important);
8543 return true; 8543 return true;
8544 } 8544 }
8545 8545
8546 StyleRuleBase* CSSParser::createFilterRule(const CSSParserString& filterName) 8546 StyleRuleBase* CSSParser::createFilterRule(const CSSParserString& filterName)
8547 { 8547 {
8548 StyleRuleFilter* rule = StyleRuleFilter::create(filterName); 8548 StyleRuleFilter* rule = StyleRuleFilter::create(filterName);
8549 rule->setProperties(createStylePropertySet()); 8549 rule->setProperties(createStylePropertySet());
8550 clearProperties(); 8550 clearProperties();
8551 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 8551 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
8552 // via the m_parsedRules collection of Members. We should 8552 // via the m_parsedRules collection of Members. We should
8553 // consider if we can deal with this in another way. 8553 // consider if we can deal with this in another way.
8554 StyleRuleFilter* result = rule; 8554 StyleRuleFilter* result = rule;
8555 m_parsedRules->append(rule); 8555 m_parsedRules->append(rule);
8556 endRuleBody(); 8556 endRuleBody();
8557 return result; 8557 return result;
8558 } 8558 }
8559 8559
8560 8560
8561 WebKitCSSFilterValue* CSSParser::parseBuiltinFilterArguments(CSSParserValueList* args, WebKitCSSFilterValue::FilterOperationType filterType) 8561 WebKitCSSFilterValue* CSSParser::parseBuiltinFilterArguments(CSSParserValueList* args, WebKitCSSFilterValue::FilterOperationType filterType)
(...skipping 2296 matching lines...) Expand 10 before | Expand all | Expand 10 after
10858 10858
10859 PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > CSSParser::sinkFloatingMediaQueryExp List(Vector<OwnPtr<MediaQueryExp> >* list) 10859 PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > CSSParser::sinkFloatingMediaQueryExp List(Vector<OwnPtr<MediaQueryExp> >* list)
10860 { 10860 {
10861 ASSERT_UNUSED(list, list == m_floatingMediaQueryExpList); 10861 ASSERT_UNUSED(list, list == m_floatingMediaQueryExpList);
10862 return m_floatingMediaQueryExpList.release(); 10862 return m_floatingMediaQueryExpList.release();
10863 } 10863 }
10864 10864
10865 MediaQuery* CSSParser::createFloatingMediaQuery(MediaQuery::Restrictor restricto r, const String& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > expressi ons) 10865 MediaQuery* CSSParser::createFloatingMediaQuery(MediaQuery::Restrictor restricto r, const String& mediaType, PassOwnPtr<Vector<OwnPtr<MediaQueryExp> > > expressi ons)
10866 { 10866 {
10867 m_floatingMediaQuery = MediaQuery::create(restrictor, mediaType, expressions ); 10867 m_floatingMediaQuery = MediaQuery::create(restrictor, mediaType, expressions );
10868 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 10868 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
10869 // via the persistent member m_floatingMediaQuery. We should 10869 // via the persistent member m_floatingMediaQuery. We should
10870 // consider if we can deal with this in another way. 10870 // consider if we can deal with this in another way.
10871 return m_floatingMediaQuery; 10871 return m_floatingMediaQuery;
10872 } 10872 }
10873 10873
10874 MediaQuery* CSSParser::createFloatingMediaQuery(PassOwnPtr<Vector<OwnPtr<MediaQu eryExp> > > expressions) 10874 MediaQuery* CSSParser::createFloatingMediaQuery(PassOwnPtr<Vector<OwnPtr<MediaQu eryExp> > > expressions)
10875 { 10875 {
10876 return createFloatingMediaQuery(MediaQuery::None, "all", expressions); 10876 return createFloatingMediaQuery(MediaQuery::None, "all", expressions);
10877 } 10877 }
10878 10878
(...skipping 13 matching lines...) Expand all
10892 StyleKeyframeVectorCollection* CSSParser::sinkFloatingKeyframeVector(StyleKeyfra meVectorCollection* keyframeVector) 10892 StyleKeyframeVectorCollection* CSSParser::sinkFloatingKeyframeVector(StyleKeyfra meVectorCollection* keyframeVector)
10893 { 10893 {
10894 ASSERT_UNUSED(keyframeVector, m_floatingKeyframeVector.raw() == keyframeVect or); 10894 ASSERT_UNUSED(keyframeVector, m_floatingKeyframeVector.raw() == keyframeVect or);
10895 return m_floatingKeyframeVector.clear(); 10895 return m_floatingKeyframeVector.clear();
10896 } 10896 }
10897 10897
10898 MediaQuerySet* CSSParser::createMediaQuerySet() 10898 MediaQuerySet* CSSParser::createMediaQuerySet()
10899 { 10899 {
10900 MediaQuerySet* queries = MediaQuerySet::create(); 10900 MediaQuerySet* queries = MediaQuerySet::create();
10901 m_parsedMediaQuerySets->append(queries); 10901 m_parsedMediaQuerySets->append(queries);
10902 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 10902 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
10903 // via the m_parsedMediaQuerySets collection of Members. We should 10903 // via the m_parsedMediaQuerySets collection of Members. We should
10904 // consider if we can deal with this in another way. 10904 // consider if we can deal with this in another way.
10905 return queries; 10905 return queries;
10906 } 10906 }
10907 10907
10908 StyleRuleBase* CSSParser::createImportRule(const CSSParserString& url, MediaQuer ySet* media) 10908 StyleRuleBase* CSSParser::createImportRule(const CSSParserString& url, MediaQuer ySet* media)
10909 { 10909 {
10910 if (!media || !m_allowImportRules) { 10910 if (!media || !m_allowImportRules) {
10911 endRuleBody(true); 10911 endRuleBody(true);
10912 return 0; 10912 return 0;
10913 } 10913 }
10914 MediaQuerySet* mediaHandle(media); 10914 MediaQuerySet* mediaHandle(media);
10915 StyleRuleImport* rule = StyleRuleImport::create(url, mediaHandle); 10915 StyleRuleImport* rule = StyleRuleImport::create(url, mediaHandle);
10916 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 10916 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
10917 // via the m_parsedRules collection of Members. We should 10917 // via the m_parsedRules collection of Members. We should
10918 // consider if we can deal with this in another way. 10918 // consider if we can deal with this in another way.
10919 StyleRuleImport* result = rule; 10919 StyleRuleImport* result = rule;
10920 m_parsedRules->append(rule); 10920 m_parsedRules->append(rule);
10921 endRuleBody(); 10921 endRuleBody();
10922 return result; 10922 return result;
10923 } 10923 }
10924 10924
10925 StyleRuleBase* CSSParser::createMediaRule(MediaQuerySet* media, RuleList* rules) 10925 StyleRuleBase* CSSParser::createMediaRule(MediaQuerySet* media, RuleList* rules)
10926 { 10926 {
10927 m_allowImportRules = m_allowNamespaceDeclarations = false; 10927 m_allowImportRules = m_allowNamespaceDeclarations = false;
10928 MediaQuerySet* mediaHandle(media); 10928 MediaQuerySet* mediaHandle(media);
10929 if (!media) 10929 if (!media)
10930 mediaHandle = MediaQuerySet::create(); 10930 mediaHandle = MediaQuerySet::create();
10931 StyleRuleMedia* rule = nullptr; 10931 StyleRuleMedia* rule = nullptr;
10932 if (rules) 10932 if (rules)
10933 rule = StyleRuleMedia::create(mediaHandle, *rules); 10933 rule = StyleRuleMedia::create(mediaHandle, *rules);
10934 else { 10934 else {
10935 RuleList emptyRules; 10935 RuleList emptyRules;
10936 rule = StyleRuleMedia::create(mediaHandle, emptyRules); 10936 rule = StyleRuleMedia::create(mediaHandle, emptyRules);
10937 } 10937 }
10938 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 10938 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
10939 // via the m_parsedRules collection of Members. We should 10939 // via the m_parsedRules collection of Members. We should
10940 // consider if we can deal with this in another way. 10940 // consider if we can deal with this in another way.
10941 StyleRuleMedia* result = rule; 10941 StyleRuleMedia* result = rule;
10942 m_parsedRules->append(rule); 10942 m_parsedRules->append(rule);
10943 endRuleBody(); 10943 endRuleBody();
10944 return result; 10944 return result;
10945 } 10945 }
10946 10946
10947 StyleRuleBase* CSSParser::createSupportsRule(bool conditionIsSupported, RuleList * rules) 10947 StyleRuleBase* CSSParser::createSupportsRule(bool conditionIsSupported, RuleList * rules)
10948 { 10948 {
(...skipping 10 matching lines...) Expand all
10959 else 10959 else
10960 conditionText = String(m_dataStart16.get() + conditionOffset, conditionL ength).stripWhiteSpace(); 10960 conditionText = String(m_dataStart16.get() + conditionOffset, conditionL ength).stripWhiteSpace();
10961 10961
10962 if (rules) 10962 if (rules)
10963 rule = StyleRuleSupports::create(conditionText, conditionIsSupported, *r ules); 10963 rule = StyleRuleSupports::create(conditionText, conditionIsSupported, *r ules);
10964 else { 10964 else {
10965 RuleList emptyRules; 10965 RuleList emptyRules;
10966 rule = StyleRuleSupports::create(conditionText, conditionIsSupported, em ptyRules); 10966 rule = StyleRuleSupports::create(conditionText, conditionIsSupported, em ptyRules);
10967 } 10967 }
10968 10968
10969 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 10969 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
10970 // via the m_parsedRules collection of Members. We should 10970 // via the m_parsedRules collection of Members. We should
10971 // consider if we can deal with this in another way. 10971 // consider if we can deal with this in another way.
10972 StyleRuleSupports* result = rule; 10972 StyleRuleSupports* result = rule;
10973 m_parsedRules->append(rule); 10973 m_parsedRules->append(rule);
10974 endRuleBody(); 10974 endRuleBody();
10975 10975
10976 return result; 10976 return result;
10977 } 10977 }
10978 10978
10979 void CSSParser::markSupportsRuleHeaderStart() 10979 void CSSParser::markSupportsRuleHeaderStart()
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
11047 } 11047 }
11048 11048
11049 StyleRuleKeyframes* CSSParser::createKeyframesRule(const String& name, StyleKeyf rameVectorCollection* popKeyframes) 11049 StyleRuleKeyframes* CSSParser::createKeyframesRule(const String& name, StyleKeyf rameVectorCollection* popKeyframes)
11050 { 11050 {
11051 StyleKeyframeVectorCollection* keyframes = popKeyframes; 11051 StyleKeyframeVectorCollection* keyframes = popKeyframes;
11052 m_allowImportRules = m_allowNamespaceDeclarations = false; 11052 m_allowImportRules = m_allowNamespaceDeclarations = false;
11053 StyleRuleKeyframes* rule = StyleRuleKeyframes::create(); 11053 StyleRuleKeyframes* rule = StyleRuleKeyframes::create();
11054 for (size_t i = 0; i < keyframes->size(); ++i) 11054 for (size_t i = 0; i < keyframes->size(); ++i)
11055 rule->parserAppendKeyframe(keyframes->at(i)); 11055 rule->parserAppendKeyframe(keyframes->at(i));
11056 rule->setName(name); 11056 rule->setName(name);
11057 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11057 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11058 // via the m_parsedRules collection of Members. We should 11058 // via the m_parsedRules collection of Members. We should
11059 // consider if we can deal with this in another way. 11059 // consider if we can deal with this in another way.
11060 StyleRuleKeyframes* rulePtr = rule; 11060 StyleRuleKeyframes* rulePtr = rule;
11061 m_parsedRules->append(rule); 11061 m_parsedRules->append(rule);
11062 endRuleBody(); 11062 endRuleBody();
11063 return rulePtr; 11063 return rulePtr;
11064 } 11064 }
11065 11065
11066 StyleRuleBase* CSSParser::createStyleRule(Vector<OwnPtr<CSSParserSelector> >* se lectors) 11066 StyleRuleBase* CSSParser::createStyleRule(Vector<OwnPtr<CSSParserSelector> >* se lectors)
11067 { 11067 {
11068 StyleRule* result = 0; 11068 StyleRule* result = 0;
11069 if (selectors) { 11069 if (selectors) {
11070 m_allowImportRules = m_allowNamespaceDeclarations = false; 11070 m_allowImportRules = m_allowNamespaceDeclarations = false;
11071 StyleRule* rule = StyleRule::create(m_lastSelectorLineNumber); 11071 StyleRule* rule = StyleRule::create(m_lastSelectorLineNumber);
11072 rule->parserAdoptSelectorVector(*selectors); 11072 rule->parserAdoptSelectorVector(*selectors);
11073 if (m_hasFontFaceOnlyValues) 11073 if (m_hasFontFaceOnlyValues)
11074 deleteFontFaceOnlyValues(); 11074 deleteFontFaceOnlyValues();
11075 rule->setProperties(createStylePropertySet()); 11075 rule->setProperties(createStylePropertySet());
11076 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11076 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11077 // via the m_parsedRules collection of Members. We should 11077 // via the m_parsedRules collection of Members. We should
11078 // consider if we can deal with this in another way. 11078 // consider if we can deal with this in another way.
11079 result = rule; 11079 result = rule;
11080 m_parsedRules->append(rule); 11080 m_parsedRules->append(rule);
11081 endRuleBody(); 11081 endRuleBody();
11082 } else 11082 } else
11083 endRuleBody(true); 11083 endRuleBody(true);
11084 clearProperties(); 11084 clearProperties();
11085 return result; 11085 return result;
11086 } 11086 }
(...skipping 11 matching lines...) Expand all
11098 // have 'initial' value and cannot 'inherit' from parent. 11098 // have 'initial' value and cannot 'inherit' from parent.
11099 // See http://dev.w3.org/csswg/css3-fonts/#font-family-desc 11099 // See http://dev.w3.org/csswg/css3-fonts/#font-family-desc
11100 clearProperties(); 11100 clearProperties();
11101 endRuleBody(true); 11101 endRuleBody(true);
11102 return 0; 11102 return 0;
11103 } 11103 }
11104 } 11104 }
11105 StyleRuleFontFace* rule = StyleRuleFontFace::create(); 11105 StyleRuleFontFace* rule = StyleRuleFontFace::create();
11106 rule->setProperties(createStylePropertySet()); 11106 rule->setProperties(createStylePropertySet());
11107 clearProperties(); 11107 clearProperties();
11108 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11108 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11109 // via the m_parsedRules collection of Members. We should 11109 // via the m_parsedRules collection of Members. We should
11110 // consider if we can deal with this in another way. 11110 // consider if we can deal with this in another way.
11111 StyleRuleFontFace* result = rule; 11111 StyleRuleFontFace* result = rule;
11112 m_parsedRules->append(rule); 11112 m_parsedRules->append(rule);
11113 endRuleBody(); 11113 endRuleBody();
11114 return result; 11114 return result;
11115 } 11115 }
11116 11116
11117 StyleRuleBase* CSSParser::createHostRule(RuleList* rules) 11117 StyleRuleBase* CSSParser::createHostRule(RuleList* rules)
11118 { 11118 {
11119 m_allowImportRules = m_allowNamespaceDeclarations = false; 11119 m_allowImportRules = m_allowNamespaceDeclarations = false;
11120 StyleRuleHost* rule = nullptr; 11120 StyleRuleHost* rule = nullptr;
11121 if (rules) 11121 if (rules)
11122 rule = StyleRuleHost::create(*rules); 11122 rule = StyleRuleHost::create(*rules);
11123 else { 11123 else {
11124 RuleList emptyRules; 11124 RuleList emptyRules;
11125 rule = StyleRuleHost::create(emptyRules); 11125 rule = StyleRuleHost::create(emptyRules);
11126 } 11126 }
11127 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11127 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11128 // via the m_parsedRules collection of Members. We should 11128 // via the m_parsedRules collection of Members. We should
11129 // consider if we can deal with this in another way. 11129 // consider if we can deal with this in another way.
11130 StyleRuleHost* result = rule; 11130 StyleRuleHost* result = rule;
11131 m_parsedRules->append(rule); 11131 m_parsedRules->append(rule);
11132 endRuleBody(); 11132 endRuleBody();
11133 return result; 11133 return result;
11134 } 11134 }
11135 11135
11136 void CSSParser::addNamespace(const AtomicString& prefix, const AtomicString& uri ) 11136 void CSSParser::addNamespace(const AtomicString& prefix, const AtomicString& uri )
11137 { 11137 {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
11240 { 11240 {
11241 // FIXME: Margin at-rules are ignored. 11241 // FIXME: Margin at-rules are ignored.
11242 m_allowImportRules = m_allowNamespaceDeclarations = false; 11242 m_allowImportRules = m_allowNamespaceDeclarations = false;
11243 StyleRulePage* pageRule = 0; 11243 StyleRulePage* pageRule = 0;
11244 if (pageSelector) { 11244 if (pageSelector) {
11245 StyleRulePage* rule = StyleRulePage::create(); 11245 StyleRulePage* rule = StyleRulePage::create();
11246 Vector<OwnPtr<CSSParserSelector> > selectorVector; 11246 Vector<OwnPtr<CSSParserSelector> > selectorVector;
11247 selectorVector.append(pageSelector); 11247 selectorVector.append(pageSelector);
11248 rule->parserAdoptSelectorVector(selectorVector); 11248 rule->parserAdoptSelectorVector(selectorVector);
11249 rule->setProperties(createStylePropertySet()); 11249 rule->setProperties(createStylePropertySet());
11250 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11250 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11251 // via the m_parsedRules collection of Members. We should 11251 // via the m_parsedRules collection of Members. We should
11252 // consider if we can deal with this in another way. 11252 // consider if we can deal with this in another way.
11253 pageRule = rule; 11253 pageRule = rule;
11254 m_parsedRules->append(rule); 11254 m_parsedRules->append(rule);
11255 endRuleBody(); 11255 endRuleBody();
11256 } else 11256 } else
11257 endRuleBody(true); 11257 endRuleBody(true);
11258 clearProperties(); 11258 clearProperties();
11259 return pageRule; 11259 return pageRule;
11260 } 11260 }
11261 11261
11262 void CSSParser::setReusableRegionSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectors) 11262 void CSSParser::setReusableRegionSelectorVector(Vector<OwnPtr<CSSParserSelector> >* selectors)
11263 { 11263 {
11264 if (selectors) 11264 if (selectors)
11265 m_reusableRegionSelectorVector.swap(*selectors); 11265 m_reusableRegionSelectorVector.swap(*selectors);
11266 } 11266 }
11267 11267
11268 StyleRuleBase* CSSParser::createRegionRule(Vector<OwnPtr<CSSParserSelector> >* r egionSelector, RuleList* rules) 11268 StyleRuleBase* CSSParser::createRegionRule(Vector<OwnPtr<CSSParserSelector> >* r egionSelector, RuleList* rules)
11269 { 11269 {
11270 if (!cssRegionsEnabled() || !regionSelector || !rules) { 11270 if (!cssRegionsEnabled() || !regionSelector || !rules) {
11271 endRuleBody(true); 11271 endRuleBody(true);
11272 return 0; 11272 return 0;
11273 } 11273 }
11274 11274
11275 m_allowImportRules = m_allowNamespaceDeclarations = false; 11275 m_allowImportRules = m_allowNamespaceDeclarations = false;
11276 11276
11277 StyleRuleRegion* regionRule = StyleRuleRegion::create(regionSelector, *rules ); 11277 StyleRuleRegion* regionRule = StyleRuleRegion::create(regionSelector, *rules );
11278 11278
11279 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11279 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11280 // via the m_parsedRules collection of Members. We should 11280 // via the m_parsedRules collection of Members. We should
11281 // consider if we can deal with this in another way. 11281 // consider if we can deal with this in another way.
11282 StyleRuleRegion* result = regionRule; 11282 StyleRuleRegion* result = regionRule;
11283 m_parsedRules->append(regionRule); 11283 m_parsedRules->append(regionRule);
11284 if (m_sourceDataHandler) 11284 if (m_sourceDataHandler)
11285 m_sourceDataHandler->startEndUnknownRule(); 11285 m_sourceDataHandler->startEndUnknownRule();
11286 11286
11287 return result; 11287 return result;
11288 } 11288 }
11289 11289
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
11350 keyString.append('%'); 11350 keyString.append('%');
11351 } 11351 }
11352 11352
11353 StyleKeyframe* keyframe = StyleKeyframe::create(); 11353 StyleKeyframe* keyframe = StyleKeyframe::create();
11354 keyframe->setKeyText(keyString.toString()); 11354 keyframe->setKeyText(keyString.toString());
11355 keyframe->setProperties(createStylePropertySet()); 11355 keyframe->setProperties(createStylePropertySet());
11356 11356
11357 clearProperties(); 11357 clearProperties();
11358 11358
11359 m_parsedKeyframes->append(keyframe); 11359 m_parsedKeyframes->append(keyframe);
11360 // FIXME(oilpan): Use of the raw pointer is safe because it is visited 11360 // FIXME(oilpan): Use of the raw pointer is safe because it is traced
11361 // via the m_parsedKeyframes collection of Members. We should 11361 // via the m_parsedKeyframes collection of Members. We should
11362 // consider if we can deal with this in another way. 11362 // consider if we can deal with this in another way.
11363 return keyframe; 11363 return keyframe;
11364 } 11364 }
11365 11365
11366 void CSSParser::invalidBlockHit() 11366 void CSSParser::invalidBlockHit()
11367 { 11367 {
11368 if (m_styleSheet && !m_hadSyntacticallyValidCSSRule) 11368 if (m_styleSheet && !m_hadSyntacticallyValidCSSRule)
11369 m_styleSheet->setHasSyntacticallyValidCSSHeader(false); 11369 m_styleSheet->setHasSyntacticallyValidCSSHeader(false);
11370 } 11370 }
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
11782 { 11782 {
11783 // The tokenizer checks for the construct of an+b. 11783 // The tokenizer checks for the construct of an+b.
11784 // However, since the {ident} rule precedes the {nth} rule, some of those 11784 // However, since the {ident} rule precedes the {nth} rule, some of those
11785 // tokens are identified as string literal. Furthermore we need to accept 11785 // tokens are identified as string literal. Furthermore we need to accept
11786 // "odd" and "even" which does not match to an+b. 11786 // "odd" and "even" which does not match to an+b.
11787 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11787 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11788 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11788 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11789 } 11789 }
11790 11790
11791 } 11791 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698