From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 10 Sep 2012 19:10:20 +0200 Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073) New snapshot --- Source/WebCore/css/CSSProperty.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'Source/WebCore/css/CSSProperty.cpp') diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index 9bc8966c1..a556b6cb6 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -22,15 +22,16 @@ #include "CSSProperty.h" #include "CSSValueList.h" -#include "MemoryInstrumentation.h" -#include "PlatformString.h" #include "RenderStyleConstants.h" #include "StylePropertyShorthand.h" +#include "WebCoreMemoryInstrumentation.h" #if ENABLE(CSS_VARIABLES) #include "CSSVariableValue.h" #endif +#include + namespace WebCore { struct SameSizeAsCSSProperty { @@ -53,7 +54,14 @@ String CSSProperty::cssName() const String CSSProperty::cssText() const { - return cssName() + ": " + m_value->cssText() + (isImportant() ? " !important" : "") + "; "; + StringBuilder result; + result.append(cssName()); + result.appendLiteral(": "); + result.append(m_value->cssText()); + if (isImportant()) + result.appendLiteral(" !important"); + result.append(';'); + return result.toString(); } void CSSProperty::wrapValueInCommaSeparatedList() @@ -468,6 +476,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyOutlineStyle: case CSSPropertyOutlineWidth: case CSSPropertyOverflow: + case CSSPropertyOverflowWrap: case CSSPropertyOverflowX: case CSSPropertyOverflowY: case CSSPropertyPadding: @@ -552,6 +561,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyWebkitBoxPack: case CSSPropertyWebkitBoxReflect: case CSSPropertyWebkitBoxShadow: + case CSSPropertyWebkitClipPath: case CSSPropertyWebkitColumnAxis: case CSSPropertyWebkitColumnBreakAfter: case CSSPropertyWebkitColumnBreakBefore: @@ -572,7 +582,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) #if ENABLE(CSS_COMPOSITING) case CSSPropertyWebkitBlendMode: #endif -#if ENABLE(CSS3_FLEXBOX) case CSSPropertyWebkitAlignContent: case CSSPropertyWebkitAlignItems: case CSSPropertyWebkitAlignSelf: @@ -585,7 +594,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyWebkitFlexWrap: case CSSPropertyWebkitJustifyContent: case CSSPropertyWebkitOrder: -#endif case CSSPropertyWebkitFontSizeDelta: case CSSPropertyWebkitGridColumns: case CSSPropertyWebkitGridRows: @@ -706,7 +714,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) void CSSProperty::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const { - MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS); + MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); info.addInstrumentedMember(m_value); } -- cgit v1.2.1