Title: [179227] trunk/Source/WebCore
- Revision
- 179227
- Author
- [email protected]
- Date
- 2015-01-27 16:02:45 -0800 (Tue, 27 Jan 2015)
Log Message
Rename isExpandedShorthand() to isShorthandCSSProperty() for clarity
https://bugs.webkit.org/show_bug.cgi?id=140954
Reviewed by Andreas Kling.
Rename isExpandedShorthand() to isShorthandCSSProperty() for clarity as
all CSS shorthand properties are now expanded during parsing (even
'font').
* css/StylePropertyShorthand.cpp:
(WebCore::isShorthandCSSProperty):
(WebCore::isExpandedShorthand): Deleted.
* css/StylePropertyShorthand.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* css/makeprop.pl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179226 => 179227)
--- trunk/Source/WebCore/ChangeLog 2015-01-27 23:43:10 UTC (rev 179226)
+++ trunk/Source/WebCore/ChangeLog 2015-01-28 00:02:45 UTC (rev 179227)
@@ -1,3 +1,22 @@
+2015-01-27 Chris Dumez <[email protected]>
+
+ Rename isExpandedShorthand() to isShorthandCSSProperty() for clarity
+ https://bugs.webkit.org/show_bug.cgi?id=140954
+
+ Reviewed by Andreas Kling.
+
+ Rename isExpandedShorthand() to isShorthandCSSProperty() for clarity as
+ all CSS shorthand properties are now expanded during parsing (even
+ 'font').
+
+ * css/StylePropertyShorthand.cpp:
+ (WebCore::isShorthandCSSProperty):
+ (WebCore::isExpandedShorthand): Deleted.
+ * css/StylePropertyShorthand.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * css/makeprop.pl:
+
2015-01-27 Eric Carlson <[email protected]>
Simplify http/tests/media/video-play-stall.html
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (179226 => 179227)
--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2015-01-27 23:43:10 UTC (rev 179226)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2015-01-28 00:02:45 UTC (rev 179227)
@@ -69,7 +69,7 @@
return StylePropertyShorthand(CSSPropertyWebkitAnimation, prefixedAnimationPropertiesForParsing);
}
-bool isExpandedShorthand(CSSPropertyID id)
+bool isShorthandCSSProperty(CSSPropertyID id)
{
return shorthandForProperty(id).length();
}
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.h (179226 => 179227)
--- trunk/Source/WebCore/css/StylePropertyShorthand.h 2015-01-27 23:43:10 UTC (rev 179226)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.h 2015-01-28 00:02:45 UTC (rev 179227)
@@ -73,7 +73,7 @@
unsigned indexOfShorthandForLonghand(CSSPropertyID, const Vector<StylePropertyShorthand>&);
-bool isExpandedShorthand(CSSPropertyID);
+bool isShorthandCSSProperty(CSSPropertyID);
} // namespace WebCore
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (179226 => 179227)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-27 23:43:10 UTC (rev 179226)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-28 00:02:45 UTC (rev 179227)
@@ -1923,7 +1923,7 @@
void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
{
- ASSERT_WITH_MESSAGE(!isExpandedShorthand(id), "Shorthand property id = %d wasn't expanded at parsing time", id);
+ ASSERT_WITH_MESSAGE(!isShorthandCSSProperty(id), "Shorthand property id = %d wasn't expanded at parsing time", id);
State& state = m_state;
Modified: trunk/Source/WebCore/css/makeprop.pl (179226 => 179227)
--- trunk/Source/WebCore/css/makeprop.pl 2015-01-27 23:43:10 UTC (rev 179226)
+++ trunk/Source/WebCore/css/makeprop.pl 2015-01-28 00:02:45 UTC (rev 179227)
@@ -873,7 +873,7 @@
foreach my $name (@names) {
print STYLEBUILDER " case CSSProperty" . $nameToId{$name} . ":\n";
if (exists $propertiesWithStyleBuilderOptions{$name}{"Longhands"}) {
- print STYLEBUILDER " ASSERT(isExpandedShorthand(property));\n";
+ print STYLEBUILDER " ASSERT(isShorthandCSSProperty(property));\n";
print STYLEBUILDER " ASSERT_NOT_REACHED();\n";
} elsif (!exists $propertiesWithStyleBuilderOptions{$name}{"SkipBuilder"}) {
print STYLEBUILDER " if (isInitial)\n";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
