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

Side by Side Diff: third_party/WebKit/Source/core/css/MediaQueryExp.cpp

Issue 2673963002: Drop hover:on-demand support & let touch-screens report "none" instead. (Closed)
Patch Set: Fixed a "yikes!" Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * CSS Media Query 2 * CSS Media Query
3 * 3 *
4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>. 4 * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 5 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
6 * Copyright (C) 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2013 Apple Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 if (mediaFeature == orientationMediaFeature) 49 if (mediaFeature == orientationMediaFeature)
50 return ident == CSSValuePortrait || ident == CSSValueLandscape; 50 return ident == CSSValuePortrait || ident == CSSValueLandscape;
51 51
52 if (mediaFeature == pointerMediaFeature || 52 if (mediaFeature == pointerMediaFeature ||
53 mediaFeature == anyPointerMediaFeature) 53 mediaFeature == anyPointerMediaFeature)
54 return ident == CSSValueNone || ident == CSSValueCoarse || 54 return ident == CSSValueNone || ident == CSSValueCoarse ||
55 ident == CSSValueFine; 55 ident == CSSValueFine;
56 56
57 if (mediaFeature == hoverMediaFeature || mediaFeature == anyHoverMediaFeature) 57 if (mediaFeature == hoverMediaFeature || mediaFeature == anyHoverMediaFeature)
58 return ident == CSSValueNone || ident == CSSValueOnDemand || 58 return ident == CSSValueNone || ident == CSSValueHover;
59 ident == CSSValueHover;
60 59
61 if (mediaFeature == scanMediaFeature) 60 if (mediaFeature == scanMediaFeature)
62 return ident == CSSValueInterlace || ident == CSSValueProgressive; 61 return ident == CSSValueInterlace || ident == CSSValueProgressive;
63 62
64 if (RuntimeEnabledFeatures::mediaQueryShapeEnabled()) { 63 if (RuntimeEnabledFeatures::mediaQueryShapeEnabled()) {
65 if (mediaFeature == shapeMediaFeature) 64 if (mediaFeature == shapeMediaFeature)
66 return ident == CSSValueRect || ident == CSSValueRound; 65 return ident == CSSValueRect || ident == CSSValueRound;
67 } 66 }
68 67
69 if (mediaFeature == colorGamutMediaFeature) { 68 if (mediaFeature == colorGamutMediaFeature) {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 output.append('/'); 324 output.append('/');
326 output.append(printNumber(denominator)); 325 output.append(printNumber(denominator));
327 } else if (isID) { 326 } else if (isID) {
328 output.append(getValueName(id)); 327 output.append(getValueName(id));
329 } 328 }
330 329
331 return output.toString(); 330 return output.toString();
332 } 331 }
333 332
334 } // namespace blink 333 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698