#include "core/CSSValueKeywords.h"
#include "core/StylePropertyShorthand.h"
#include "core/css/CSSPropertyMetadata.h"
+#include "core/css/CSSValuePool.h"
#include "wtf/BitArray.h"
#include "wtf/text/StringBuilder.h"
return value.length() == 7 && (value == initial || value == inherit);
}
+StylePropertySerializer::StylePropertySetForSerializer::StylePropertySetForSerializer(const StylePropertySet& properties)
+ : m_propertySet(properties)
+ , m_allIndex(m_propertySet.findPropertyIndex(CSSPropertyAll))
+ , m_needToExpandAll(false)
+{
+ if (!hasAllProperty())
+ return;
+
+ StylePropertySet::PropertyReference allProperty = m_propertySet.propertyAt(m_allIndex);
+ for (unsigned i = 0; i < m_propertySet.propertyCount(); ++i) {
+ StylePropertySet::PropertyReference property = m_propertySet.propertyAt(i);
+ if (CSSProperty::isAffectedByAllProperty(property.id())) {
+ if (allProperty.isImportant() && !property.isImportant())
+ continue;
+ if (static_cast<unsigned>(m_allIndex) >= i)
+ continue;
+ if (property.value()->equals(*allProperty.value())
+ && property.isImportant() == allProperty.isImportant())
+ continue;
+ m_needToExpandAll = true;
+ }
+ m_longhandPropertyUsed.set(property.id() - firstCSSProperty);
+ }
+}
+
+unsigned StylePropertySerializer::StylePropertySetForSerializer::propertyCount() const
+{
+ if (!hasExpandedAllProperty())
+ return m_propertySet.propertyCount();
+ return lastCSSProperty - firstCSSProperty + 1;
+}
+
+StylePropertySerializer::PropertyValueForSerializer StylePropertySerializer::StylePropertySetForSerializer::propertyAt(unsigned index) const
+{
+ if (!hasExpandedAllProperty())
+ return StylePropertySerializer::PropertyValueForSerializer(m_propertySet.propertyAt(index));
+
+ CSSPropertyID propertyID = static_cast<CSSPropertyID>(index + firstCSSProperty);
+ ASSERT(firstCSSProperty <= propertyID && propertyID <= lastCSSProperty);
+ if (m_longhandPropertyUsed.get(index)) {
+ int index = m_propertySet.findPropertyIndex(propertyID);
+ ASSERT(index != -1);
+ return StylePropertySerializer::PropertyValueForSerializer(m_propertySet.propertyAt(index));
+ }
+
+ StylePropertySet::PropertyReference property = m_propertySet.propertyAt(m_allIndex);
+ const CSSValue* value = property.value();
+
+ // FIXME: Firefox shows properties with "unset" when some cssRule has
+ // expanded "all" with "unset". So we should use "unset" here.
+ // After implementing "unset" value correctly, (i.e. StyleBuilder should
+ // support "display: unset", "color: unset", ... and so on),
+ // we should fix the following code.
+ if (!value->isInitialValue() && !value->isInheritedValue()) {
+ if (CSSPropertyMetadata::isInheritedProperty(propertyID))
+ value = cssValuePool().createInheritedValue().get();
+ else
+ value = cssValuePool().createExplicitInitialValue().get();
+ }
+ return StylePropertySerializer::PropertyValueForSerializer(propertyID, value, property.isImportant());
+}
+
+bool StylePropertySerializer::StylePropertySetForSerializer::shouldProcessPropertyAt(unsigned index) const
+{
+ // StylePropertySet has all valid longhands. We should process.
+ if (!hasAllProperty())
+ return true;
+
+ // If all is not expanded, we need to process "all" and properties which
+ // are not overwritten by "all".
+ if (!m_needToExpandAll) {
+ StylePropertySet::PropertyReference property = m_propertySet.propertyAt(index);
+ if (property.id() == CSSPropertyAll || !CSSProperty::isAffectedByAllProperty(property.id()))
+ return true;
+ return m_longhandPropertyUsed.get(property.id() - firstCSSProperty);
+ }
+
+ CSSPropertyID propertyID = static_cast<CSSPropertyID>(index + firstCSSProperty);
+ ASSERT(firstCSSProperty <= propertyID && propertyID <= lastCSSProperty);
+
+ // Since "all" is expanded, we don't need to process "all".
+ // We should not process expanded shorthands (e.g. font, background,
+ // and so on) either.
+ if (isShorthandProperty(propertyID) || propertyID == CSSPropertyAll)
+ return false;
+ // We should not serialize internal properties.
+ if (isInternalProperty(propertyID))
+ return false;
+
+ // The all property is a shorthand that resets all CSS properties except
+ // direction and unicode-bidi. It only accepts the CSS-wide keywords.
+ // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
+ if (!CSSProperty::isAffectedByAllProperty(propertyID))
+ return m_longhandPropertyUsed.get(index);
+
+ return true;
+}
+
+int StylePropertySerializer::StylePropertySetForSerializer::findPropertyIndex(CSSPropertyID propertyID) const
+{
+ if (!hasExpandedAllProperty())
+ return m_propertySet.findPropertyIndex(propertyID);
+ return propertyID - firstCSSProperty;
+}
+
+const CSSValue* StylePropertySerializer::StylePropertySetForSerializer::getPropertyCSSValue(CSSPropertyID propertyID) const
+{
+ int index = findPropertyIndex(propertyID);
+ if (index == -1)
+ return 0;
+ StylePropertySerializer::PropertyValueForSerializer value = propertyAt(index);
+ return value.value();
+}
+
+String StylePropertySerializer::StylePropertySetForSerializer::getPropertyValue(CSSPropertyID propertyID) const
+{
+ if (!hasExpandedAllProperty())
+ return m_propertySet.getPropertyValue(propertyID);
+
+ const CSSValue* value = getPropertyCSSValue(propertyID);
+ if (!value)
+ return String();
+ return value->cssText();
+}
+
+bool StylePropertySerializer::StylePropertySetForSerializer::isPropertyImplicit(CSSPropertyID propertyID) const
+{
+ int index = findPropertyIndex(propertyID);
+ if (index == -1)
+ return false;
+ StylePropertySerializer::PropertyValueForSerializer value = propertyAt(index);
+ return value.isImplicit();
+}
+
+bool StylePropertySerializer::StylePropertySetForSerializer::propertyIsImportant(CSSPropertyID propertyID) const
+{
+ int index = findPropertyIndex(propertyID);
+ if (index == -1)
+ return false;
+ StylePropertySerializer::PropertyValueForSerializer value = propertyAt(index);
+ return value.isImportant();
+}
+
StylePropertySerializer::StylePropertySerializer(const StylePropertySet& properties)
: m_propertySet(properties)
{
unsigned size = m_propertySet.propertyCount();
unsigned numDecls = 0;
for (unsigned n = 0; n < size; ++n) {
- StylePropertySet::PropertyReference property = m_propertySet.propertyAt(n);
+ if (!m_propertySet.shouldProcessPropertyAt(n))
+ continue;
+
+ StylePropertySerializer::PropertyValueForSerializer property = m_propertySet.propertyAt(n);
CSSPropertyID propertyID = property.id();
// Only enabled or internal properties should be part of the style.
ASSERT(CSSPropertyMetadata::isEnabledProperty(propertyID) || isInternalProperty(propertyID));
CSSPropertyID shorthandPropertyID = CSSPropertyInvalid;
CSSPropertyID borderFallbackShorthandProperty = CSSPropertyInvalid;
String value;
+ ASSERT(!isShorthandProperty(propertyID));
switch (propertyID) {
case CSSPropertyBackgroundAttachment:
case CSSPropertyWebkitMaskOrigin:
shorthandPropertyID = CSSPropertyWebkitMask;
break;
- case CSSPropertyWebkitTransformOriginX:
- case CSSPropertyWebkitTransformOriginY:
- case CSSPropertyWebkitTransformOriginZ:
- shorthandPropertyID = CSSPropertyWebkitTransformOrigin;
- break;
case CSSPropertyWebkitTransitionProperty:
case CSSPropertyWebkitTransitionDuration:
case CSSPropertyWebkitTransitionTimingFunction:
case CSSPropertyWebkitTransitionDelay:
shorthandPropertyID = CSSPropertyWebkitTransition;
break;
+ case CSSPropertyAll:
+ result.append(getPropertyText(propertyID, property.value()->cssText(), property.isImportant(), numDecls++));
+ continue;
default:
break;
}
propertyID = shorthandPropertyID;
shorthandPropertyUsed.set(shortPropertyIndex);
}
- } else
+ } else {
+ // We should not show "initial" when the "initial" is implicit.
+ // If explicit "initial", we need to show.
+ if (property.value()->isImplicitInitialValue())
+ continue;
value = property.value()->cssText();
-
- if (value == "initial" && !CSSPropertyMetadata::isInheritedProperty(propertyID))
- continue;
+ }
result.append(getPropertyText(propertyID, value, property.isImportant(), numDecls++));
}
// Shorthand and 4-values properties
switch (propertyID) {
case CSSPropertyAnimation:
- return getLayeredShorthandValue(animationShorthand());
+ return getLayeredShorthandValue(animationShorthand(), true);
case CSSPropertyBorderSpacing:
return borderSpacingValue(borderSpacingShorthand());
case CSSPropertyBackgroundPosition:
case CSSPropertyPadding:
return get4Values(paddingShorthand());
case CSSPropertyTransition:
- return getLayeredShorthandValue(transitionShorthand());
+ return getLayeredShorthandValue(transitionShorthand(), true);
case CSSPropertyListStyle:
return getShorthandValue(listStyleShorthand());
case CSSPropertyWebkitMaskPosition:
return getShorthandValue(webkitTextEmphasisShorthand());
case CSSPropertyWebkitTextStroke:
return getShorthandValue(webkitTextStrokeShorthand());
- case CSSPropertyTransformOrigin:
- case CSSPropertyWebkitTransformOrigin:
- return getShorthandValue(webkitTransformOriginShorthand());
case CSSPropertyWebkitTransition:
- return getLayeredShorthandValue(webkitTransitionShorthand());
+ return getLayeredShorthandValue(webkitTransitionShorthand(), true);
case CSSPropertyWebkitAnimation:
- return getLayeredShorthandValue(webkitAnimationShorthand());
+ return getLayeredShorthandValue(webkitAnimationShorthand(), true);
case CSSPropertyMarker: {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyMarkerStart);
- if (value)
+ if (const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyMarkerStart))
return value->cssText();
return String();
}
String StylePropertySerializer::borderSpacingValue(const StylePropertyShorthand& shorthand) const
{
- RefPtrWillBeRawPtr<CSSValue> horizontalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[0]);
- RefPtrWillBeRawPtr<CSSValue> verticalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[1]);
+ const CSSValue* horizontalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[0]);
+ const CSSValue* verticalValue = m_propertySet.getPropertyCSSValue(shorthand.properties()[1]);
// While standard border-spacing property does not allow specifying border-spacing-vertical without
// specifying border-spacing-horizontal <http://www.w3.org/TR/CSS21/tables.html#separated-borders>,
if (fontSizePropertyIndex == -1 || fontFamilyPropertyIndex == -1)
return emptyString();
- StylePropertySet::PropertyReference fontSizeProperty = m_propertySet.propertyAt(fontSizePropertyIndex);
- StylePropertySet::PropertyReference fontFamilyProperty = m_propertySet.propertyAt(fontFamilyPropertyIndex);
+ PropertyValueForSerializer fontSizeProperty = m_propertySet.propertyAt(fontSizePropertyIndex);
+ PropertyValueForSerializer fontFamilyProperty = m_propertySet.propertyAt(fontFamilyPropertyIndex);
if (fontSizeProperty.isImplicit() || fontFamilyProperty.isImplicit())
return emptyString();
if (topValueIndex == -1 || rightValueIndex == -1 || bottomValueIndex == -1 || leftValueIndex == -1)
return String();
- StylePropertySet::PropertyReference top = m_propertySet.propertyAt(topValueIndex);
- StylePropertySet::PropertyReference right = m_propertySet.propertyAt(rightValueIndex);
- StylePropertySet::PropertyReference bottom = m_propertySet.propertyAt(bottomValueIndex);
- StylePropertySet::PropertyReference left = m_propertySet.propertyAt(leftValueIndex);
+ PropertyValueForSerializer top = m_propertySet.propertyAt(topValueIndex);
+ PropertyValueForSerializer right = m_propertySet.propertyAt(rightValueIndex);
+ PropertyValueForSerializer bottom = m_propertySet.propertyAt(bottomValueIndex);
+ PropertyValueForSerializer left = m_propertySet.propertyAt(leftValueIndex);
// All 4 properties must be specified.
if (!top.value() || !right.value() || !bottom.value() || !left.value())
return result.toString();
}
-String StylePropertySerializer::getLayeredShorthandValue(const StylePropertyShorthand& shorthand) const
+String StylePropertySerializer::getLayeredShorthandValue(const StylePropertyShorthand& shorthand, bool checkShorthandAvailable) const
{
StringBuilder result;
const unsigned size = shorthand.length();
// Begin by collecting the properties into an array.
- WillBeHeapVector<RefPtrWillBeMember<CSSValue> > values(size);
+ WillBeHeapVector<const CSSValue*> values(size);
size_t numLayers = 0;
for (unsigned i = 0; i < size; ++i) {
values[i] = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
if (values[i]) {
if (values[i]->isBaseValueList()) {
- CSSValueList* valueList = toCSSValueList(values[i].get());
+ const CSSValueList* valueList = toCSSValueList(values[i]);
numLayers = std::max(valueList->length(), numLayers);
} else {
numLayers = std::max<size_t>(1U, numLayers);
}
+ } else if (checkShorthandAvailable) {
+ return String();
}
}
+
String commonValue;
bool commonValueInitialized = false;
bool useSingleWordShorthand = false;
bool foundPositionYCSSProperty = false;
for (unsigned j = 0; j < size; j++) {
- RefPtrWillBeRawPtr<CSSValue> value = nullptr;
+ const CSSValue* value = 0;
if (values[j]) {
if (values[j]->isBaseValueList()) {
- value = toCSSValueList(values[j].get())->itemWithBoundsCheck(i);
+ value = toCSSValueList(values[j])->itemWithBoundsCheck(i);
} else {
value = values[j];
// Color only belongs in the last layer.
if (shorthand.properties()[j] == CSSPropertyBackgroundColor) {
if (i != numLayers - 1)
- value = nullptr;
+ value = 0;
} else if (i) {
// Other singletons only belong in the first layer.
- value = nullptr;
+ value = 0;
}
}
}
// BUG 49055: make sure the value was not reset in the layer check just above.
if ((j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyBackgroundRepeatY && value)
|| (j < size - 1 && shorthand.properties()[j + 1] == CSSPropertyWebkitMaskRepeatY && value)) {
- RefPtrWillBeRawPtr<CSSValue> yValue = nullptr;
- RefPtrWillBeRawPtr<CSSValue> nextValue = values[j + 1];
+ const CSSValue* yValue = 0;
+ const CSSValue* nextValue = values[j + 1];
if (nextValue->isValueList())
- yValue = toCSSValueList(nextValue.get())->item(i);
+ yValue = toCSSValueList(nextValue)->item(i);
else
yValue = nextValue;
if (!value->isPrimitiveValue() || !yValue->isPrimitiveValue())
continue;
- CSSValueID xId = toCSSPrimitiveValue(value.get())->getValueID();
- CSSValueID yId = toCSSPrimitiveValue(yValue.get())->getValueID();
+ CSSValueID xId = toCSSPrimitiveValue(value)->getValueID();
+ CSSValueID yId = toCSSPrimitiveValue(yValue)->getValueID();
if (xId != yId) {
if (xId == CSSValueRepeat && yId == CSSValueNoRepeat) {
useRepeatXShorthand = true;
StringBuilder result;
for (unsigned i = 0; i < shorthand.length(); ++i) {
if (!m_propertySet.isPropertyImplicit(shorthand.properties()[i])) {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
if (!value)
return String();
String valueText = value->cssText();
String res;
bool lastPropertyWasImportant = false;
for (unsigned i = 0; i < shorthand.length(); ++i) {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
// FIXME: CSSInitialValue::cssText should generate the right value.
if (!value)
return String();
String StylePropertySerializer::backgroundRepeatPropertyValue() const
{
- RefPtrWillBeRawPtr<CSSValue> repeatX = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatX);
- RefPtrWillBeRawPtr<CSSValue> repeatY = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatY);
+ const CSSValue* repeatX = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatX);
+ const CSSValue* repeatY = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundRepeatY);
if (!repeatX || !repeatY)
return String();
if (m_propertySet.propertyIsImportant(CSSPropertyBackgroundRepeatX) != m_propertySet.propertyIsImportant(CSSPropertyBackgroundRepeatY))
return repeatX->cssText();
}
- RefPtrWillBeRawPtr<CSSValueList> repeatXList;
- if (repeatX->cssValueType() == CSSValue::CSS_PRIMITIVE_VALUE) {
- repeatXList = CSSValueList::createCommaSeparated();
- repeatXList->append(repeatX);
- } else if (repeatX->cssValueType() == CSSValue::CSS_VALUE_LIST) {
- repeatXList = toCSSValueList(repeatX.get());
- } else {
+ const CSSValueList* repeatXList = 0;
+ int repeatXLength = 1;
+ if (repeatX->cssValueType() == CSSValue::CSS_VALUE_LIST) {
+ repeatXList = toCSSValueList(repeatX);
+ repeatXLength = repeatXList->length();
+ } else if (repeatX->cssValueType() != CSSValue::CSS_PRIMITIVE_VALUE) {
return String();
}
- RefPtrWillBeRawPtr<CSSValueList> repeatYList;
- if (repeatY->cssValueType() == CSSValue::CSS_PRIMITIVE_VALUE) {
- repeatYList = CSSValueList::createCommaSeparated();
- repeatYList->append(repeatY);
- } else if (repeatY->cssValueType() == CSSValue::CSS_VALUE_LIST) {
- repeatYList = toCSSValueList(repeatY.get());
- } else {
+ const CSSValueList* repeatYList = 0;
+ int repeatYLength = 1;
+ if (repeatY->cssValueType() == CSSValue::CSS_VALUE_LIST) {
+ repeatYList = toCSSValueList(repeatY);
+ repeatYLength = repeatYList->length();
+ } else if (repeatY->cssValueType() != CSSValue::CSS_PRIMITIVE_VALUE) {
return String();
}
- size_t shorthandLength = lowestCommonMultiple(repeatXList->length(), repeatYList->length());
+ size_t shorthandLength = lowestCommonMultiple(repeatXLength, repeatYLength);
StringBuilder builder;
for (size_t i = 0; i < shorthandLength; ++i) {
if (i)
builder.appendLiteral(", ");
- appendBackgroundRepeatValue(builder,
- *repeatXList->item(i % repeatXList->length()),
- *repeatYList->item(i % repeatYList->length()));
+
+ const CSSValue* xValue = repeatXList ? repeatXList->item(i % repeatXList->length()) : repeatX;
+ const CSSValue* yValue = repeatYList ? repeatYList->item(i % repeatYList->length()) : repeatY;
+ appendBackgroundRepeatValue(builder, *xValue, *yValue);
}
return builder.toString();
}
return;
}
if (shorthandHasOnlyInitialOrInheritedValue(backgroundShorthand())) {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundImage);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundImage);
bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundImage);
result.append(getPropertyText(CSSPropertyBackground, value->cssText(), isImportant, numDecls++));
return;
for (unsigned i = 0; i < WTF_ARRAY_LENGTH(backgroundPropertyIds); ++i) {
CSSPropertyID propertyID = backgroundPropertyIds[i];
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(propertyID);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(propertyID);
if (!value)
continue;
result.append(getPropertyText(propertyID, value->cssText(), m_propertySet.propertyIsImportant(propertyID), numDecls++));
// would not work in Firefox (<rdar://problem/5143183>)
// It would be a better solution if background-position was CSS_PAIR.
if (shorthandHasOnlyInitialOrInheritedValue(backgroundPositionShorthand())) {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX);
bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionX);
result.append(getPropertyText(CSSPropertyBackgroundPosition, value->cssText(), isImportant, numDecls++));
} else if (isPropertyShorthandAvailable(backgroundPositionShorthand())) {
result.append(getPropertyText(CSSPropertyBackgroundPosition, positionValue, isImportant, numDecls++));
} else {
// should check background-position-x or background-position-y.
- if (RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX)) {
+ if (const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionX)) {
if (!value->isImplicitInitialValue()) {
bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionX);
result.append(getPropertyText(CSSPropertyBackgroundPositionX, value->cssText(), isImportant, numDecls++));
}
}
- if (RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionY)) {
+ if (const CSSValue* value = m_propertySet.getPropertyCSSValue(CSSPropertyBackgroundPositionY)) {
if (!value->isImplicitInitialValue()) {
bool isImportant = m_propertySet.propertyIsImportant(CSSPropertyBackgroundPositionY);
result.append(getPropertyText(CSSPropertyBackgroundPositionY, value->cssText(), isImportant, numDecls++));
bool isImportant = m_propertySet.propertyIsImportant(shorthand.properties()[0]);
for (unsigned i = 0; i < shorthand.length(); ++i) {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
if (!value || (value->isInitialValue() && !value->isImplicitInitialValue()) || value->isInheritedValue())
return false;
if (isImportant != m_propertySet.propertyIsImportant(shorthand.properties()[i]))
bool isInitialValue = true;
bool isInheritedValue = true;
for (unsigned i = 0; i < shorthand.length(); ++i) {
- RefPtrWillBeRawPtr<CSSValue> value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
+ const CSSValue* value = m_propertySet.getPropertyCSSValue(shorthand.properties()[i]);
if (!value)
return false;
if (!value->isInitialValue())
projects / platform / framework / web / crosswalk.git / blobdiff