diff options
Diffstat (limited to 'Source/WebCore/css/CSSProperty.cpp')
-rw-r--r-- | Source/WebCore/css/CSSProperty.cpp | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index b412fdbfa..79be67b46 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -41,29 +41,6 @@ struct SameSizeAsCSSProperty { COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small); -String CSSProperty::cssName() const -{ -#if ENABLE(CSS_VARIABLES) - if (id() == CSSPropertyVariable) { - ASSERT(value()->isVariableValue()); - return "-webkit-var-" + static_cast<CSSVariableValue*>(value())->name(); - } -#endif - return getPropertyNameString(id()); -} - -String CSSProperty::cssText() const -{ - 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() { RefPtr<CSSValue> value = m_value.release(); @@ -704,6 +681,12 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) #if ENABLE(DRAGGABLE_REGION) case CSSPropertyWebkitAppRegion: #endif +#if ENABLE(CSS_DEVICE_ADAPTATION) + case CSSPropertyMaxZoom: + case CSSPropertyMinZoom: + case CSSPropertyOrientation: + case CSSPropertyUserZoom: +#endif return false; case CSSPropertyInvalid: ASSERT_NOT_REACHED(); |