| Index: Source/core/editing/EditingStyle.cpp
|
| diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
|
| index e5f099a8217de22b8acddb6dd589f20f2286870d..28e6ecd981b444ae7e7a29525bb845611d148b58 100644
|
| --- a/Source/core/editing/EditingStyle.cpp
|
| +++ b/Source/core/editing/EditingStyle.cpp
|
| @@ -306,7 +306,7 @@ PassRefPtr<CSSValue> HTMLFontSizeEquivalent::attributeValueAsCSSValue(Element* e
|
| ASSERT(element);
|
| if (!element->hasAttribute(m_attrName))
|
| return 0;
|
| - int size;
|
| + CSSValueID size;
|
| if (!HTMLFontElement::cssValueFromFontSizeNumber(element->getAttribute(m_attrName), size))
|
| return 0;
|
| return CSSPrimitiveValue::createIdentifier(size);
|
| @@ -953,9 +953,9 @@ void EditingStyle::prepareToApplyAt(const Position& position, ShouldPreserveWrit
|
| m_mutableStyle->removeProperty(CSSPropertyBackgroundColor);
|
|
|
| if (unicodeBidi && unicodeBidi->isPrimitiveValue()) {
|
| - m_mutableStyle->setProperty(CSSPropertyUnicodeBidi, static_cast<CSSPrimitiveValue*>(unicodeBidi.get())->getIdent());
|
| + m_mutableStyle->setProperty(CSSPropertyUnicodeBidi, static_cast<CSSValueID>(toCSSPrimitiveValue(unicodeBidi.get())->getIdent()));
|
| if (direction && direction->isPrimitiveValue())
|
| - m_mutableStyle->setProperty(CSSPropertyDirection, static_cast<CSSPrimitiveValue*>(direction.get())->getIdent());
|
| + m_mutableStyle->setProperty(CSSPropertyDirection, static_cast<CSSValueID>(toCSSPrimitiveValue(direction.get())->getIdent()));
|
| }
|
| }
|
|
|
|
|