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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/editing/EditingStyle.cpp

Issue 20262002: [css3-text] Implement text-decoration property shorthand (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: OK, so trybots are not fond of binary files - removing Mac expectation for repaint-text-decoration-… Created 7 years, 5 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
« Source/core/css/CSSParser-in.cpp ('K') | « Source/core/css/CSSShorthands.in ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/EditingStyle.cpp
diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
index 59edb027d905e0a286144de7c353ae4ed2bd59eb..2cc490062d791861c3d6eb17ad0b6d42498565f5 100644
--- a/Source/core/editing/EditingStyle.cpp
+++ b/Source/core/editing/EditingStyle.cpp
@@ -58,13 +58,14 @@ namespace WebCore {
// Editing style properties must be preserved during editing operation.
// e.g. when a user inserts a new paragraph, all properties listed here must be copied to the new paragraph.
// NOTE: Use editingProperties() to respect runtime enabling of properties.
-static const unsigned nonInheritedStaticPropertiesCount = 2;
+static const unsigned nonInheritedStaticPropertiesCount = 3;
static const CSSPropertyID staticEditingProperties[] = {
- // NOTE: inheritableEditingProperties depends on these two properties being first.
+ // NOTE: inheritableEditingProperties depends on these properties being first.
// If you change this list, make sure to update nonInheritedPropertyCount.
CSSPropertyBackgroundColor,
CSSPropertyTextDecoration,
+ CSSPropertyTextDecorationLine,
// CSS inheritable properties
CSSPropertyColor,
@@ -93,8 +94,11 @@ enum EditingPropertiesType { OnlyInheritableEditingProperties, AllEditingPropert
static const Vector<CSSPropertyID>& allEditingProperties()
{
DEFINE_STATIC_LOCAL(Vector<CSSPropertyID>, properties, ());
- if (properties.isEmpty())
+ if (properties.isEmpty()) {
RuntimeCSSEnabled::filterEnabledCSSPropertiesIntoVector(staticEditingProperties, WTF_ARRAY_LENGTH(staticEditingProperties), properties);
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ properties.remove(properties.find(CSSPropertyTextDecoration));
+ }
return properties;
}
@@ -203,21 +207,27 @@ private:
};
HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent(CSSValueID primitiveValue, const QualifiedName& tagName)
- : HTMLElementEquivalent(CSSPropertyTextDecoration, primitiveValue, tagName)
+ : HTMLElementEquivalent(RuntimeEnabledFeatures::css3TextDecorationsEnabled() ? CSSPropertyTextDecorationLine : CSSPropertyTextDecoration, primitiveValue, tagName)
// m_propertyID is used in HTMLElementEquivalent::addToStyle
{
}
bool HTMLTextDecorationEquivalent::propertyExistsInStyle(const StylePropertySet* style) const
{
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ return style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect) || style->getPropertyCSSValue(CSSPropertyTextDecorationLine);
return style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect) || style->getPropertyCSSValue(CSSPropertyTextDecoration);
}
bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, StylePropertySet* style) const
{
RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
- if (!styleValue)
- styleValue = style->getPropertyCSSValue(CSSPropertyTextDecoration);
+ if (!styleValue) {
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ styleValue = style->getPropertyCSSValue(CSSPropertyTextDecorationLine);
+ else
+ styleValue = style->getPropertyCSSValue(CSSPropertyTextDecoration);
+ }
return matches(element) && styleValue && styleValue->isValueList() && static_cast<CSSValueList*>(styleValue.get())->hasValue(m_primitiveValue.get());
}
@@ -441,8 +451,11 @@ void EditingStyle::init(Node* node, PropertiesToInclude propertiesToInclude)
if (propertiesToInclude == EditingPropertiesInEffect) {
if (RefPtr<CSSValue> value = backgroundColorInEffect(node))
m_mutableStyle->setProperty(CSSPropertyBackgroundColor, value->cssText());
- if (RefPtr<CSSValue> value = computedStyleAtPosition->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect))
+ if (RefPtr<CSSValue> value = computedStyleAtPosition->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect)) {
m_mutableStyle->setProperty(CSSPropertyTextDecoration, value->cssText());
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ m_mutableStyle->setProperty(CSSPropertyTextDecorationLine, value->cssText());
+ }
}
if (node && node->computedStyle()) {
@@ -650,16 +663,23 @@ void EditingStyle::collapseTextDecorationProperties()
if (!textDecorationsInEffect)
return;
- if (textDecorationsInEffect->isValueList())
- m_mutableStyle->setProperty(CSSPropertyTextDecoration, textDecorationsInEffect->cssText(), m_mutableStyle->propertyIsImportant(CSSPropertyTextDecoration));
- else
+ if (textDecorationsInEffect->isValueList()) {
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ m_mutableStyle->setProperty(CSSPropertyTextDecorationLine, textDecorationsInEffect->cssText(), m_mutableStyle->propertyIsImportant(CSSPropertyTextDecorationLine));
+ else
+ m_mutableStyle->setProperty(CSSPropertyTextDecoration, textDecorationsInEffect->cssText(), m_mutableStyle->propertyIsImportant(CSSPropertyTextDecoration));
+ } else {
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ m_mutableStyle->removeProperty(CSSPropertyTextDecorationLine);
m_mutableStyle->removeProperty(CSSPropertyTextDecoration);
+ }
m_mutableStyle->removeProperty(CSSPropertyWebkitTextDecorationsInEffect);
}
// CSS properties that create a visual difference only when applied to text.
static const CSSPropertyID textOnlyProperties[] = {
CSSPropertyTextDecoration,
+ CSSPropertyTextDecorationLine,
CSSPropertyWebkitTextDecorationsInEffect,
CSSPropertyFontStyle,
CSSPropertyFontWeight,
@@ -732,13 +752,29 @@ bool EditingStyle::conflictsWithInlineStyleOfElement(Element* element, EditingSt
if (propertyID == CSSPropertyWhiteSpace && isTabSpanNode(element))
continue;
- if (propertyID == CSSPropertyWebkitTextDecorationsInEffect && inlineStyle->getPropertyCSSValue(CSSPropertyTextDecoration)) {
- if (!conflictingProperties)
- return true;
- conflictingProperties->append(CSSPropertyTextDecoration);
- if (extractedStyle)
- extractedStyle->setProperty(CSSPropertyTextDecoration, inlineStyle->getPropertyValue(CSSPropertyTextDecoration), inlineStyle->propertyIsImportant(CSSPropertyTextDecoration));
- continue;
+ if (propertyID == CSSPropertyWebkitTextDecorationsInEffect) {
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled()) {
+ RefPtr<CSSValue> textDecorationLine = inlineStyle->getPropertyCSSValue(CSSPropertyTextDecorationLine);
+ if (textDecorationLine) {
+ if (!conflictingProperties)
+ return true;
+ conflictingProperties->append(CSSPropertyTextDecoration);
+ conflictingProperties->append(CSSPropertyTextDecorationLine);
+ if (extractedStyle)
+ extractedStyle->setProperty(CSSPropertyTextDecorationLine, inlineStyle->getPropertyValue(CSSPropertyTextDecorationLine), inlineStyle->propertyIsImportant(CSSPropertyTextDecorationLine));
+ continue;
+ }
+ } else {
+ RefPtr<CSSValue> textDecoration = inlineStyle->getPropertyCSSValue(CSSPropertyTextDecoration);
+ if (textDecoration) {
+ if (!conflictingProperties)
+ return true;
+ conflictingProperties->append(CSSPropertyTextDecoration);
+ if (extractedStyle)
+ extractedStyle->setProperty(CSSPropertyTextDecoration, inlineStyle->getPropertyValue(CSSPropertyTextDecoration), inlineStyle->propertyIsImportant(CSSPropertyTextDecoration));
+ continue;
+ }
+ }
}
if (!inlineStyle->getPropertyCSSValue(propertyID))
@@ -1078,7 +1114,12 @@ void EditingStyle::mergeStyle(const StylePropertySet* style, CSSPropertyOverride
RefPtr<CSSValue> value = m_mutableStyle->getPropertyCSSValue(property.id());
// text decorations never override values
- if ((property.id() == CSSPropertyTextDecoration || property.id() == CSSPropertyWebkitTextDecorationsInEffect) && property.value()->isValueList() && value) {
+ bool isPropertyTextDecorationEquivalent = property.id() == CSSPropertyWebkitTextDecorationsInEffect;
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ isPropertyTextDecorationEquivalent = isPropertyTextDecorationEquivalent || property.id() == CSSPropertyTextDecorationLine;
Julien - ping for review 2013/07/27 01:46:35 isPropertyTextDecorationEquivalent |= property.id(
abinader 2013/07/28 04:21:52 Ah yes, shame on me on skipping operator|= usage :
+ else
+ isPropertyTextDecorationEquivalent = isPropertyTextDecorationEquivalent || property.id() == CSSPropertyTextDecoration;
+ if (isPropertyTextDecorationEquivalent && property.value()->isValueList() && value) {
if (value->isValueList()) {
mergeTextDecorationValues(static_cast<CSSValueList*>(value.get()), static_cast<CSSValueList*>(property.value()));
continue;
@@ -1334,17 +1375,28 @@ static void reconcileTextDecorationProperties(MutableStylePropertySet* style)
{
RefPtr<CSSValue> textDecorationsInEffect = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(CSSPropertyTextDecoration);
+ RefPtr<CSSValue> textDecorationLine = style->getPropertyCSSValue(CSSPropertyTextDecorationLine);
// We shouldn't have both text-decoration and -webkit-text-decorations-in-effect because that wouldn't make sense.
- ASSERT(!textDecorationsInEffect || !textDecoration);
+ ASSERT(!textDecorationsInEffect || (!textDecoration || !textDecorationLine));
if (textDecorationsInEffect) {
- style->setProperty(CSSPropertyTextDecoration, textDecorationsInEffect->cssText());
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled()) {
+ style->setProperty(CSSPropertyTextDecorationLine, textDecorationsInEffect->cssText());
+ textDecorationLine = textDecorationsInEffect;
+ } else {
+ style->setProperty(CSSPropertyTextDecoration, textDecorationsInEffect->cssText());
+ textDecoration = textDecorationsInEffect;
+ }
style->removeProperty(CSSPropertyWebkitTextDecorationsInEffect);
- textDecoration = textDecorationsInEffect;
}
// If text-decoration is set to "none", remove the property because we don't want to add redundant "text-decoration: none".
- if (textDecoration && !textDecoration->isValueList())
- style->removeProperty(CSSPropertyTextDecoration);
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled()) {
+ if (textDecorationLine && !textDecorationLine->isValueList())
+ style->removeProperty(CSSPropertyTextDecorationLine);
+ } else {
+ if (textDecoration && !textDecoration->isValueList())
+ style->removeProperty(CSSPropertyTextDecoration);
+ }
}
StyleChange::StyleChange(EditingStyle* style, const Position& position)
@@ -1408,7 +1460,8 @@ void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet*
// Assuming reconcileTextDecorationProperties has been called, there should not be -webkit-text-decorations-in-effect
// Furthermore, text-decoration: none has been trimmed so that text-decoration property is always a CSSValueList.
- RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(CSSPropertyTextDecoration);
+ CSSPropertyID textDecorationProperty = RuntimeEnabledFeatures::css3TextDecorationsEnabled() ? CSSPropertyTextDecorationLine : CSSPropertyTextDecoration;
+ RefPtr<CSSValue> textDecoration = style->getPropertyCSSValue(textDecorationProperty);
if (textDecoration && textDecoration->isValueList()) {
DEFINE_STATIC_LOCAL(RefPtr<CSSPrimitiveValue>, underline, (CSSPrimitiveValue::createIdentifier(CSSValueUnderline)));
DEFINE_STATIC_LOCAL(RefPtr<CSSPrimitiveValue>, lineThrough, (CSSPrimitiveValue::createIdentifier(CSSValueLineThrough)));
@@ -1420,7 +1473,7 @@ void StyleChange::extractTextStyles(Document* document, MutableStylePropertySet*
m_applyLineThrough = true;
// If trimTextDecorations, delete underline and line-through
- setTextDecorationProperty(style, newTextDecoration.get(), CSSPropertyTextDecoration);
+ setTextDecorationProperty(style, newTextDecoration.get(), textDecorationProperty);
}
int verticalAlign = getIdentifierValue(style, CSSPropertyVerticalAlign);
@@ -1525,7 +1578,10 @@ PassRefPtr<MutableStylePropertySet> getPropertiesNotIn(StylePropertySet* styleWi
result->removeEquivalentProperties(baseStyle);
RefPtr<CSSValue> baseTextDecorationsInEffect = baseStyle->getPropertyCSSValueInternal(CSSPropertyWebkitTextDecorationsInEffect);
- diffTextDecorations(result.get(), CSSPropertyTextDecoration, baseTextDecorationsInEffect.get());
+ if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
+ diffTextDecorations(result.get(), CSSPropertyTextDecorationLine, baseTextDecorationsInEffect.get());
+ else
+ diffTextDecorations(result.get(), CSSPropertyTextDecoration, baseTextDecorationsInEffect.get());
diffTextDecorations(result.get(), CSSPropertyWebkitTextDecorationsInEffect, baseTextDecorationsInEffect.get());
if (baseStyle->getPropertyCSSValueInternal(CSSPropertyFontWeight) && fontWeightIsBold(result.get()) == fontWeightIsBold(baseStyle))
« Source/core/css/CSSParser-in.cpp ('K') | « Source/core/css/CSSShorthands.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698