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

Side by Side Diff: Source/core/css/CSSParser.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d. 5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 FUnknown = 0x0000, 578 FUnknown = 0x0000,
579 FInteger = 0x0001, 579 FInteger = 0x0001,
580 FNumber = 0x0002, // Real Numbers 580 FNumber = 0x0002, // Real Numbers
581 FPercent = 0x0004, 581 FPercent = 0x0004,
582 FLength = 0x0008, 582 FLength = 0x0008,
583 FAngle = 0x0010, 583 FAngle = 0x0010,
584 FTime = 0x0020, 584 FTime = 0x0020,
585 FFrequency = 0x0040, 585 FFrequency = 0x0040,
586 FPositiveInteger = 0x0080, 586 FPositiveInteger = 0x0080,
587 FRelative = 0x0100, 587 FRelative = 0x0100,
588 #if ENABLE(RESOLUTION_MEDIA_QUERY)
589 FResolution = 0x0200, 588 FResolution = 0x0200,
590 #endif
591 FNonNeg = 0x0400 589 FNonNeg = 0x0400
592 }; 590 };
593 591
594 friend inline Units operator|(Units a, Units b) 592 friend inline Units operator|(Units a, Units b)
595 { 593 {
596 return static_cast<Units>(static_cast<unsigned>(a) | static_cast<unsigne d>(b)); 594 return static_cast<Units>(static_cast<unsigned>(a) | static_cast<unsigne d>(b));
597 } 595 }
598 596
599 enum ReleaseParsedCalcValueCondition { 597 enum ReleaseParsedCalcValueCondition {
600 ReleaseParsedCalcValue, 598 ReleaseParsedCalcValue,
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 } 695 }
698 696
699 inline int cssyylex(void* yylval, CSSParser* parser) 697 inline int cssyylex(void* yylval, CSSParser* parser)
700 { 698 {
701 return parser->lex(yylval); 699 return parser->lex(yylval);
702 } 700 }
703 701
704 } // namespace WebCore 702 } // namespace WebCore
705 703
706 #endif // CSSParser_h 704 #endif // CSSParser_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/media/w3c/test_media_queries-expected.txt ('k') | Source/core/css/CSSParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698