diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebCore/css/CSSPrimitiveValue.h | |
parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebCore/css/CSSPrimitiveValue.h')
-rw-r--r-- | Source/WebCore/css/CSSPrimitiveValue.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSPrimitiveValue.h b/Source/WebCore/css/CSSPrimitiveValue.h index aa2dbeac3..fcc5b83b8 100644 --- a/Source/WebCore/css/CSSPrimitiveValue.h +++ b/Source/WebCore/css/CSSPrimitiveValue.h @@ -143,7 +143,7 @@ public: UTime, UFrequency, UViewportPercentageLength, -#if ENABLE(CSS_IMAGE_RESOLUTION) +#if ENABLE(CSS_IMAGE_RESOLUTION) || ENABLE(RESOLUTION_MEDIA_QUERY) UResolution, #endif UOther @@ -181,6 +181,10 @@ public: bool isCalculated() const { return m_primitiveUnitType == CSS_CALC; } bool isCalculatedPercentageWithNumber() const { return primitiveType() == CSS_CALC_PERCENTAGE_WITH_NUMBER; } bool isCalculatedPercentageWithLength() const { return primitiveType() == CSS_CALC_PERCENTAGE_WITH_LENGTH; } + bool isDotsPerInch() const { return primitiveType() == CSS_DPI; } + bool isDotsPerPixel() const { return primitiveType() == CSS_DPPX; } + bool isDotsPerCentimeter() const { return primitiveType() == CSS_DPCM; } + #if ENABLE(CSS_VARIABLES) bool isVariableName() const { return primitiveType() == CSS_VARIABLE_NAME; } #endif |