[webkit-changes] [97511] trunk/Source/WebCore

Fri, 14 Oct 2011 14:59:36 -0700

Title: [97511] trunk/Source/WebCore
Revision
97511
Author
[email protected]
Date
2011-10-14 15:00:38 -0700 (Fri, 14 Oct 2011)

Log Message

CSSParser: Remove StyleBase usage.
https://bugs.webkit.org/show_bug.cgi?id=70150

Reviewed by Darin Adler.

Split CSSParser::m_parsedStyleObjects into two vectors of
CSSRules and MediaLists.

* css/CSSParser.cpp:
(WebCore::CSSParser::createMediaList):
(WebCore::CSSParser::createCharsetRule):
(WebCore::CSSParser::createImportRule):
(WebCore::CSSParser::createMediaRule):
(WebCore::CSSParser::createKeyframesRule):
(WebCore::CSSParser::createStyleRule):
(WebCore::CSSParser::createFontFaceRule):
(WebCore::CSSParser::createPageRule):
(WebCore::CSSParser::createKeyframeRule):
* css/CSSParser.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (97510 => 97511)


--- trunk/Source/WebCore/ChangeLog	2011-10-14 21:58:24 UTC (rev 97510)
+++ trunk/Source/WebCore/ChangeLog	2011-10-14 22:00:38 UTC (rev 97511)
@@ -1,3 +1,25 @@
+2011-10-14  Andreas Kling  <[email protected]>
+
+        CSSParser: Remove StyleBase usage.
+        https://bugs.webkit.org/show_bug.cgi?id=70150
+
+        Reviewed by Darin Adler.
+
+        Split CSSParser::m_parsedStyleObjects into two vectors of
+        CSSRules and MediaLists.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::createMediaList):
+        (WebCore::CSSParser::createCharsetRule):
+        (WebCore::CSSParser::createImportRule):
+        (WebCore::CSSParser::createMediaRule):
+        (WebCore::CSSParser::createKeyframesRule):
+        (WebCore::CSSParser::createStyleRule):
+        (WebCore::CSSParser::createFontFaceRule):
+        (WebCore::CSSParser::createPageRule):
+        (WebCore::CSSParser::createKeyframeRule):
+        * css/CSSParser.h:
+
 2011-10-14  Adam Barth  <[email protected]>
 
         canvas getImageData should explain why it throws SECURITY_ERR

Modified: trunk/Source/WebCore/css/CSSParser.cpp (97510 => 97511)


--- trunk/Source/WebCore/css/CSSParser.cpp	2011-10-14 21:58:24 UTC (rev 97510)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2011-10-14 22:00:38 UTC (rev 97511)
@@ -7146,7 +7146,7 @@
 {
     RefPtr<MediaList> list = MediaList::create();
     MediaList* result = list.get();
-    m_parsedStyleObjects.append(list.release());
+    m_parsedMediaLists.append(list.release());
     return result;
 }
 
@@ -7156,7 +7156,7 @@
         return 0;
     RefPtr<CSSCharsetRule> rule = CSSCharsetRule::create(m_styleSheet, charset);
     CSSCharsetRule* result = rule.get();
-    m_parsedStyleObjects.append(rule.release());
+    m_parsedRules.append(rule.release());
     return result;
 }
 
@@ -7166,7 +7166,7 @@
         return 0;
     RefPtr<CSSImportRule> rule = CSSImportRule::create(m_styleSheet, url, media);
     CSSImportRule* result = rule.get();
-    m_parsedStyleObjects.append(rule.release());
+    m_parsedRules.append(rule.release());
     return result;
 }
 
@@ -7177,7 +7177,7 @@
     m_allowImportRules = m_allowNamespaceDeclarations = false;
     RefPtr<CSSMediaRule> rule = CSSMediaRule::create(m_styleSheet, media, rules);
     CSSMediaRule* result = rule.get();
-    m_parsedStyleObjects.append(rule.release());
+    m_parsedRules.append(rule.release());
     return result;
 }
 
@@ -7195,7 +7195,7 @@
     m_allowImportRules = m_allowNamespaceDeclarations = false;
     RefPtr<WebKitCSSKeyframesRule> rule = WebKitCSSKeyframesRule::create(m_styleSheet);
     WebKitCSSKeyframesRule* rulePtr = rule.get();
-    m_parsedStyleObjects.append(rule.release());
+    m_parsedRules.append(rule.release());
     return rulePtr;
 }
 
@@ -7211,7 +7211,7 @@
             deleteFontFaceOnlyValues();
         rule->setDeclaration(CSSMutableStyleDeclaration::create(rule.get(), m_parsedProperties, m_numParsedProperties));
         result = rule.get();
-        m_parsedStyleObjects.append(rule.release());
+        m_parsedRules.append(rule.release());
         if (m_ruleRangeMap) {
             ASSERT(m_currentRuleData);
             m_currentRuleData->styleSourceData->styleBodyRange = m_ruleBodyRange;
@@ -7251,7 +7251,7 @@
     rule->setDeclaration(CSSMutableStyleDeclaration::create(rule.get(), m_parsedProperties, m_numParsedProperties));
     clearProperties();
     CSSFontFaceRule* result = rule.get();
-    m_parsedStyleObjects.append(rule.release());
+    m_parsedRules.append(rule.release());
     return result;
 }
 
@@ -7324,7 +7324,7 @@
         rule->adoptSelectorVector(selectorVector);
         rule->setDeclaration(CSSMutableStyleDeclaration::create(rule.get(), m_parsedProperties, m_numParsedProperties));
         pageRule = rule.get();
-        m_parsedStyleObjects.append(rule.release());
+        m_parsedRules.append(rule.release());
     }
     clearProperties();
     return pageRule;
@@ -7390,7 +7390,7 @@
     clearProperties();
 
     WebKitCSSKeyframeRule* keyframePtr = keyframe.get();
-    m_parsedStyleObjects.append(keyframe.release());
+    m_parsedRules.append(keyframe.release());
     return keyframePtr;
 }

Modified: trunk/Source/WebCore/css/CSSParser.h (97510 => 97511)


--- trunk/Source/WebCore/css/CSSParser.h	2011-10-14 21:58:24 UTC (rev 97510)
+++ trunk/Source/WebCore/css/CSSParser.h	2011-10-14 22:00:38 UTC (rev 97511)
@@ -53,7 +53,6 @@
 class Document;
 class MediaList;
 class MediaQueryExp;
-class StyleBase;
 class WebKitCSSKeyframeRule;
 class WebKitCSSKeyframesRule;
 class CSSWrapShape;
@@ -344,7 +343,8 @@
     bool m_allowImportRules;
     bool m_allowNamespaceDeclarations;
 
-    Vector<RefPtr<StyleBase> > m_parsedStyleObjects;
+    Vector<RefPtr<CSSRule> > m_parsedRules;
+    Vector<RefPtr<MediaList> > m_parsedMediaLists;
     Vector<RefPtr<CSSRuleList> > m_parsedRuleLists;
     HashSet<CSSParserSelector*> m_floatingSelectors;
     HashSet<Vector<OwnPtr<CSSParserSelector> >*> m_floatingSelectorVectors;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to