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

Side by Side Diff: sky/engine/core/css/parser/CSSGrammar.y

Issue 788883005: Remove REM units. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 2
3 /* 3 /*
4 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 App le Inc. All rights reserved.
6 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2012 Intel Corporation. All rights reserved. 8 * Copyright (C) 2012 Intel Corporation. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 %token IMPORTANT_SYM 193 %token IMPORTANT_SYM
194 %token MEDIA_ONLY 194 %token MEDIA_ONLY
195 %token MEDIA_NOT 195 %token MEDIA_NOT
196 %token MEDIA_AND 196 %token MEDIA_AND
197 %token MEDIA_OR 197 %token MEDIA_OR
198 198
199 %token SUPPORTS_NOT 199 %token SUPPORTS_NOT
200 %token SUPPORTS_AND 200 %token SUPPORTS_AND
201 %token SUPPORTS_OR 201 %token SUPPORTS_OR
202 202
203 %token <number> REMS
204 %token <number> CHS 203 %token <number> CHS
205 %token <number> EMS 204 %token <number> EMS
206 %token <number> EXS 205 %token <number> EXS
207 %token <number> PXS 206 %token <number> PXS
208 %token <number> CMS 207 %token <number> CMS
209 %token <number> MMS 208 %token <number> MMS
210 %token <number> INS 209 %token <number> INS
211 %token <number> PTS 210 %token <number> PTS
212 %token <number> PCS 211 %token <number> PCS
213 %token <number> DEGS 212 %token <number> DEGS
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 | DEGS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DEG); } 1294 | DEGS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DEG); }
1296 | RADS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_RAD); } 1295 | RADS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_RAD); }
1297 | GRADS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_GRAD); } 1296 | GRADS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_GRAD); }
1298 | TURNS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_TURN); } 1297 | TURNS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_TURN); }
1299 | MSECS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_MS); } 1298 | MSECS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_MS); }
1300 | SECS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_S); } 1299 | SECS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_S); }
1301 | HERTZ { $$.setFromNumber($1, CSSPrimitiveValue::CSS_HZ); } 1300 | HERTZ { $$.setFromNumber($1, CSSPrimitiveValue::CSS_HZ); }
1302 | KHERTZ { $$.setFromNumber($1, CSSPrimitiveValue::CSS_KHZ); } 1301 | KHERTZ { $$.setFromNumber($1, CSSPrimitiveValue::CSS_KHZ); }
1303 | EMS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_EMS); } 1302 | EMS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_EMS); }
1304 | EXS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_EXS); } 1303 | EXS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_EXS); }
1305 | REMS {
1306 $$.setFromNumber($1, CSSPrimitiveValue::CSS_REMS);
1307 if (parser->m_styleSheet)
1308 parser->m_styleSheet->parserSetUsesRemUnits(true);
1309 }
1310 | CHS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_CHS); } 1304 | CHS { $$.setFromNumber($1, CSSPrimitiveValue::CSS_CHS); }
1311 | VW { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VW); } 1305 | VW { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VW); }
1312 | VH { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VH); } 1306 | VH { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VH); }
1313 | VMIN { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VMIN); } 1307 | VMIN { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VMIN); }
1314 | VMAX { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VMAX); } 1308 | VMAX { $$.setFromNumber($1, CSSPrimitiveValue::CSS_VMAX); }
1315 | DPPX { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DPPX); } 1309 | DPPX { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DPPX); }
1316 | DPI { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DPI); } 1310 | DPI { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DPI); }
1317 | DPCM { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DPCM); } 1311 | DPCM { $$.setFromNumber($1, CSSPrimitiveValue::CSS_DPCM); }
1318 | FR { $$.setFromNumber($1, CSSPrimitiveValue::CSS_FR); } 1312 | FR { $$.setFromNumber($1, CSSPrimitiveValue::CSS_FR); }
1319 ; 1313 ;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1484 ; 1478 ;
1485 1479
1486 rule_error_recovery: 1480 rule_error_recovery:
1487 /* empty */ 1481 /* empty */
1488 | rule_error_recovery error 1482 | rule_error_recovery error
1489 | rule_error_recovery invalid_square_brackets_block 1483 | rule_error_recovery invalid_square_brackets_block
1490 | rule_error_recovery invalid_parentheses_block 1484 | rule_error_recovery invalid_parentheses_block
1491 ; 1485 ;
1492 1486
1493 %% 1487 %%
OLDNEW
« no previous file with comments | « sky/engine/core/css/StyleSheetContents.cpp ('k') | sky/engine/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698