Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: Source/core/css/CSSPrimitiveValue.h

Issue 14408004: Fix incorrect evaluation of resolution media queries (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/CSSPrimitiveValue.h
diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index dc3dc3071ad5f30a6dc0570f0200647c1a2b0f57..ddce500176a5d239b9f338f8fcc8119929a46e8b 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -139,9 +139,7 @@ public:
UTime,
UFrequency,
UViewportPercentageLength,
-#if ENABLE(RESOLUTION_MEDIA_QUERY)
UResolution,
-#endif
UOther
};
@@ -183,6 +181,11 @@ public:
bool isDotsPerInch() const { return primitiveType() == CSS_DPI; }
bool isDotsPerPixel() const { return primitiveType() == CSS_DPPX; }
bool isDotsPerCentimeter() const { return primitiveType() == CSS_DPCM; }
+ bool isResolution() const
+ {
+ unsigned short type = primitiveType();
+ return type >= CSS_DPPX && type <= CSS_DPCM;
+ }
bool isVariableName() const { return primitiveType() == CSS_VARIABLE_NAME; }
bool isViewportPercentageLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMAX; }
bool isFlex() const { return primitiveType() == CSS_FR; }

Powered by Google App Engine
This is Rietveld 408576698