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

Unified Diff: Source/core/css/MediaQueryExp.cpp

Issue 451113002: Updated hover media feature to comply updated media queries spec (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Change behind RuntimeEnabledFeature status=stable Created 6 years, 4 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
« no previous file with comments | « Source/core/css/MediaQueryEvaluatorTest.cpp ('k') | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/MediaQueryExp.cpp
diff --git a/Source/core/css/MediaQueryExp.cpp b/Source/core/css/MediaQueryExp.cpp
index 8e3107add808a3c8a42a7d5f7f5ebd8ce0b62326..5eebfe6cffc7b35bb0a15e61c3d99edaadf6fb25 100644
--- a/Source/core/css/MediaQueryExp.cpp
+++ b/Source/core/css/MediaQueryExp.cpp
@@ -35,6 +35,7 @@
#include "core/css/CSSPrimitiveValue.h"
#include "core/html/parser/HTMLParserIdioms.h"
#include "platform/Decimal.h"
+#include "platform/RuntimeEnabledFeatures.h"
#include "wtf/text/StringBuffer.h"
#include "wtf/text/StringBuilder.h"
@@ -49,6 +50,7 @@ static inline bool featureWithCSSValueID(const String& mediaFeature, const CSSPa
return mediaFeature == orientationMediaFeature
|| mediaFeature == pointerMediaFeature
+ || (mediaFeature == hoverMediaFeature && RuntimeEnabledFeatures::hoverMediaQueryKeywordsEnabled())
|| mediaFeature == scanMediaFeature;
}
@@ -60,6 +62,9 @@ static inline bool featureWithValidIdent(const String& mediaFeature, CSSValueID
if (mediaFeature == pointerMediaFeature)
return ident == CSSValueNone || ident == CSSValueCoarse || ident == CSSValueFine;
+ if (mediaFeature == hoverMediaFeature && RuntimeEnabledFeatures::hoverMediaQueryKeywordsEnabled())
+ return ident == CSSValueNone || ident == CSSValueOnDemand || ident == CSSValueHover;
+
if (mediaFeature == scanMediaFeature)
return ident == CSSValueInterlace || ident == CSSValueProgressive;
@@ -148,7 +153,7 @@ static inline bool featureWithZeroOrOne(const String& mediaFeature, const CSSPar
return false;
return mediaFeature == gridMediaFeature
- || mediaFeature == hoverMediaFeature;
+ || (mediaFeature == hoverMediaFeature && !RuntimeEnabledFeatures::hoverMediaQueryKeywordsEnabled());
}
static inline bool featureWithAspectRatio(const String& mediaFeature)
« no previous file with comments | « Source/core/css/MediaQueryEvaluatorTest.cpp ('k') | Source/platform/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698