Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (179118 => 179119)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-26 17:51:56 UTC (rev 179118)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-26 17:52:35 UTC (rev 179119)
@@ -119,13 +119,6 @@
-epub-writing-mode = -webkit-writing-mode
zoom [Custom=All]
-// line height needs to be right after the above high-priority properties
-#if defined(ENABLE_IOS_TEXT_AUTOSIZING) && ENABLE_IOS_TEXT_AUTOSIZING
-line-height [Inherited, Custom=All]
-#else
-line-height [Inherited, Getter=specifiedLineHeight, ConditionalConverter=LineHeight]
-#endif
-
// Keep this in between the highest priority props and the lower ones.
-webkit-ruby-position [Inherited]
@@ -244,6 +237,11 @@
left [Initial=initialOffset, Converter=LengthOrAuto]
letter-spacing [Inherited, Converter=Spacing]
lighting-color [SVG, Converter=SVGColor]
+#if defined(ENABLE_IOS_TEXT_AUTOSIZING) && ENABLE_IOS_TEXT_AUTOSIZING
+line-height [Inherited, Custom=All]
+#else
+line-height [Inherited, Getter=specifiedLineHeight, ConditionalConverter=LineHeight]
+#endif
list-style [Inherited, Longhands=list-style-type|list-style-position|list-style-image]
list-style-image [Inherited, Converter=StyleImage<CSSPropertyListStyleImage>]
list-style-position [Inherited]
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (179118 => 179119)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-26 17:51:56 UTC (rev 179118)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-26 17:52:35 UTC (rev 179119)
@@ -168,7 +168,8 @@
using namespace HTMLNames;
-static const CSSPropertyID firstLowPriorityProperty = static_cast<CSSPropertyID>(CSSPropertyLineHeight + 1);
+static const CSSPropertyID lastHighPriorityProperty = CSSPropertyZoom;
+static const CSSPropertyID firstLowPriorityProperty = static_cast<CSSPropertyID>(lastHighPriorityProperty + 1);
class StyleResolver::CascadedProperties {
public:
@@ -820,7 +821,6 @@
// Create the style
state.setStyle(RenderStyle::clone(elementStyle));
state.setParentStyle(RenderStyle::clone(elementStyle));
- state.setLineHeightValue(0);
TextDirection direction;
WritingMode writingMode;
@@ -831,15 +831,11 @@
CascadedProperties cascade(direction, writingMode);
cascade.addMatches(result, false, 0, result.matchedProperties.size() - 1);
- applyCascadedProperties(cascade, firstCSSProperty, CSSPropertyLineHeight);
+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
// If our font got dirtied, go ahead and update it now.
updateFont();
- // Line-height is set when we are sure we decided on the font-size
- if (state.lineHeightValue())
- applyProperty(CSSPropertyLineHeight, state.lineHeightValue());
-
// Now do rest of the properties.
applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
@@ -991,7 +987,6 @@
PageRuleCollector collector(m_state, m_ruleSets);
collector.matchAllPageRules(pageIndex);
- m_state.setLineHeightValue(0);
MatchResult& result = collector.matchedResult();
@@ -1002,15 +997,11 @@
CascadedProperties cascade(direction, writingMode);
cascade.addMatches(result, false, 0, result.matchedProperties.size() - 1);
- applyCascadedProperties(cascade, firstCSSProperty, CSSPropertyLineHeight);
+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
// If our font got dirtied, go ahead and update it now.
updateFont();
- // Line-height is set when we are sure we decided on the font-size.
- if (m_state.lineHeightValue())
- applyProperty(CSSPropertyLineHeight, m_state.lineHeightValue());
-
applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
cascade.applyDeferredProperties(*this);
@@ -1751,7 +1742,6 @@
// Find out if there's a -webkit-appearance property in effect from the UA sheet.
// If so, we cache the border and background styles so that RenderTheme::adjustStyle()
// can look at them later to figure out if this is a styled form control or not.
- state.setLineHeightValue(nullptr);
CascadedProperties cascade(direction, writingMode);
if (!cascade.addMatches(matchResult, false, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly)
|| !cascade.addMatches(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly))
@@ -1761,7 +1751,7 @@
adjustStyleForInterCharacterRuby();
// Start by applying properties that other properties may depend on.
- applyCascadedProperties(cascade, firstCSSProperty, CSSPropertyLineHeight);
+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
updateFont();
applyCascadedProperties(cascade, firstLowPriorityProperty, lastCSSProperty);
@@ -1776,15 +1766,13 @@
|| !cascade.addMatches(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly))
return applyMatchedProperties(matchResult, element, DoNotUseMatchedPropertiesCache);
- state.setLineHeightValue(nullptr);
-
applyCascadedProperties(cascade, CSSPropertyWebkitRubyPosition, CSSPropertyWebkitRubyPosition);
// Adjust the font size to be smaller if ruby-position is inter-character.
adjustStyleForInterCharacterRuby();
// Start by applying properties that other properties may depend on.
- applyCascadedProperties(cascade, firstCSSProperty, CSSPropertyLineHeight);
+ applyCascadedProperties(cascade, firstCSSProperty, lastHighPriorityProperty);
// If the effective zoom value changes, we can't use the matched properties cache. Start over.
if (cacheItem && cacheItem->renderStyle->effectiveZoom() != state.style()->effectiveZoom())
@@ -1793,10 +1781,6 @@
// If our font got dirtied, go ahead and update it now.
updateFont();
- // Line-height is set when we are sure we decided on the font-size.
- if (state.lineHeightValue())
- applyProperty(CSSPropertyLineHeight, state.lineHeightValue());
-
// If the font changed, we can't use the matched properties cache. Start over.
if (cacheItem && cacheItem->renderStyle->fontDescription() != state.style()->fontDescription())
return applyMatchedProperties(matchResult, element, DoNotUseMatchedPropertiesCache);
@@ -2099,8 +2083,6 @@
fontDescription.setOneFamily(standardFamily);
fontDescription.setKeywordSizeFromIdentifier(CSSValueMedium);
setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueMedium, false, document()));
- m_state.style()->setLineHeight(RenderStyle::initialLineHeight());
- m_state.setLineHeightValue(0);
setFontDescription(fontDescription);
}
@@ -2688,13 +2670,6 @@
{
State& state = resolver.state();
- // FIXME: It would be nice if line-height were less of a special snowflake.
- if (id == CSSPropertyLineHeight) {
- if (auto value = state.style()->insideLink() == NotInsideLink ? cssValue[0] : cssValue[SelectorChecker::MatchLink])
- state.setLineHeightValue(value);
- return;
- }
-
if (cssValue[0]) {
state.setApplyPropertyToRegularStyle(true);
state.setApplyPropertyToVisitedLinkStyle(false);
Modified: trunk/Source/WebCore/css/StyleResolver.h (179118 => 179119)
--- trunk/Source/WebCore/css/StyleResolver.h 2015-01-26 17:51:56 UTC (rev 179118)
+++ trunk/Source/WebCore/css/StyleResolver.h 2015-01-26 17:52:35 UTC (rev 179119)
@@ -344,7 +344,6 @@
, m_elementAffectedByClassRules(false)
, m_applyPropertyToRegularStyle(true)
, m_applyPropertyToVisitedLinkStyle(false)
- , m_lineHeightValue(nullptr)
, m_fontDirty(false)
, m_fontSizeHasViewportUnits(false)
, m_hasUAAppearance(false)
@@ -382,8 +381,6 @@
Vector<RefPtr<ReferenceFilterOperation>>& filtersWithPendingSVGDocuments() { return m_filtersWithPendingSVGDocuments; }
Vector<RefPtr<MaskImageOperation>>& maskImagesWithPendingSVGDocuments() { return m_maskImagesWithPendingSVGDocuments; }
- void setLineHeightValue(CSSValue* value) { m_lineHeightValue = value; }
- CSSValue* lineHeightValue() { return m_lineHeightValue; }
void setFontDirty(bool isDirty) { m_fontDirty = isDirty; }
bool fontDirty() const { return m_fontDirty; }
void setFontSizeHasViewportUnits(bool hasViewportUnits) { m_fontSizeHasViewportUnits = hasViewportUnits; }
@@ -431,7 +428,6 @@
Vector<RefPtr<ReferenceFilterOperation>> m_filtersWithPendingSVGDocuments;
Vector<RefPtr<MaskImageOperation>> m_maskImagesWithPendingSVGDocuments;
- CSSValue* m_lineHeightValue;
bool m_fontDirty;
bool m_fontSizeHasViewportUnits;
