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

Side by Side Diff: Source/core/css/CSSPrimitiveValue.cpp

Issue 660223002: Fix typo in parsing vmin/vmax in new css-syntax parser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: added test Created 6 years, 2 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
« no previous file with comments | « no previous file | Source/core/css/parser/SizesAttributeParserTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 table.set(String("grad"), CSSPrimitiveValue::CSS_GRAD); 128 table.set(String("grad"), CSSPrimitiveValue::CSS_GRAD);
129 table.set(String("ms"), CSSPrimitiveValue::CSS_MS); 129 table.set(String("ms"), CSSPrimitiveValue::CSS_MS);
130 table.set(String("s"), CSSPrimitiveValue::CSS_S); 130 table.set(String("s"), CSSPrimitiveValue::CSS_S);
131 table.set(String("hz"), CSSPrimitiveValue::CSS_HZ); 131 table.set(String("hz"), CSSPrimitiveValue::CSS_HZ);
132 table.set(String("khz"), CSSPrimitiveValue::CSS_KHZ); 132 table.set(String("khz"), CSSPrimitiveValue::CSS_KHZ);
133 table.set(String("dpi"), CSSPrimitiveValue::CSS_DPI); 133 table.set(String("dpi"), CSSPrimitiveValue::CSS_DPI);
134 table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM); 134 table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM);
135 table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX); 135 table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX);
136 table.set(String("vw"), CSSPrimitiveValue::CSS_VW); 136 table.set(String("vw"), CSSPrimitiveValue::CSS_VW);
137 table.set(String("vh"), CSSPrimitiveValue::CSS_VH); 137 table.set(String("vh"), CSSPrimitiveValue::CSS_VH);
138 table.set(String("vmax"), CSSPrimitiveValue::CSS_VMIN); 138 table.set(String("vmin"), CSSPrimitiveValue::CSS_VMIN);
139 table.set(String("vmin"), CSSPrimitiveValue::CSS_VMAX); 139 table.set(String("vmax"), CSSPrimitiveValue::CSS_VMAX);
140 table.set(String("rem"), CSSPrimitiveValue::CSS_REMS); 140 table.set(String("rem"), CSSPrimitiveValue::CSS_REMS);
141 table.set(String("fr"), CSSPrimitiveValue::CSS_FR); 141 table.set(String("fr"), CSSPrimitiveValue::CSS_FR);
142 table.set(String("turn"), CSSPrimitiveValue::CSS_TURN); 142 table.set(String("turn"), CSSPrimitiveValue::CSS_TURN);
143 table.set(String("ch"), CSSPrimitiveValue::CSS_CHS); 143 table.set(String("ch"), CSSPrimitiveValue::CSS_CHS);
144 return table; 144 return table;
145 } 145 }
146 146
147 CSSPrimitiveValue::UnitType CSSPrimitiveValue::fromName(const String& unit) 147 CSSPrimitiveValue::UnitType CSSPrimitiveValue::fromName(const String& unit)
148 { 148 {
149 DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable() )); 149 DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable() ));
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 visitor->trace(m_value.shape); 1425 visitor->trace(m_value.shape);
1426 break; 1426 break;
1427 default: 1427 default:
1428 break; 1428 break;
1429 } 1429 }
1430 #endif 1430 #endif
1431 CSSValue::traceAfterDispatch(visitor); 1431 CSSValue::traceAfterDispatch(visitor);
1432 } 1432 }
1433 1433
1434 } // namespace blink 1434 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/parser/SizesAttributeParserTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698