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

Unified Diff: Source/core/css/parser/CSSParserImpl.cpp

Issue 1303173007: Oilpan: Unship Oilpan from CSSValues Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.h ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSParserImpl.cpp
diff --git a/Source/core/css/parser/CSSParserImpl.cpp b/Source/core/css/parser/CSSParserImpl.cpp
index 57aa15886b1d6d77ac40822252dfc1da549b24df..b8eef99139930dc2af4d67f6adc2c7f317afcc01 100644
--- a/Source/core/css/parser/CSSParserImpl.cpp
+++ b/Source/core/css/parser/CSSParserImpl.cpp
@@ -49,7 +49,7 @@ bool CSSParserImpl::parseValue(MutableStylePropertySet* declaration, CSSProperty
return declaration->addParsedProperties(parser.m_parsedProperties);
}
-static inline void filterProperties(bool important, const WillBeHeapVector<CSSProperty, 256>& input, WillBeHeapVector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
+static inline void filterProperties(bool important, const Vector<CSSProperty, 256>& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
{
// Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
for (size_t i = input.size(); i--; ) {
@@ -64,11 +64,11 @@ static inline void filterProperties(bool important, const WillBeHeapVector<CSSPr
}
}
-static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> createStylePropertySet(WillBeHeapVector<CSSProperty, 256>& parsedProperties, CSSParserMode mode)
+static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> createStylePropertySet(Vector<CSSProperty, 256>& parsedProperties, CSSParserMode mode)
{
BitArray<numCSSProperties> seenProperties;
size_t unusedEntries = parsedProperties.size();
- WillBeHeapVector<CSSProperty, 256> results(unusedEntries);
+ Vector<CSSProperty, 256> results(unusedEntries);
filterProperties(true, parsedProperties, results, unusedEntries, seenProperties);
filterProperties(false, parsedProperties, results, unusedEntries, seenProperties);
@@ -103,7 +103,7 @@ bool CSSParserImpl::parseDeclarationList(MutableStylePropertySet* declaration, c
BitArray<numCSSProperties> seenProperties;
size_t unusedEntries = parser.m_parsedProperties.size();
- WillBeHeapVector<CSSProperty, 256> results(unusedEntries);
+ Vector<CSSProperty, 256> results(unusedEntries);
filterProperties(true, parser.m_parsedProperties, results, unusedEntries, seenProperties);
filterProperties(false, parser.m_parsedProperties, results, unusedEntries, seenProperties);
if (unusedEntries)
« no previous file with comments | « Source/core/css/parser/CSSParserImpl.h ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698