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

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

Issue 196653020: Revert 169289 "A thread-safe Media Query Parser" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/Source/core/css/CSSPrimitiveValue.h ('k') | trunk/Source/core/css/MediaList.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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 case CSSPrimitiveValue::CSS_UNICODE_RANGE: 105 case CSSPrimitiveValue::CSS_UNICODE_RANGE:
106 case CSSPrimitiveValue::CSS_UNKNOWN: 106 case CSSPrimitiveValue::CSS_UNKNOWN:
107 case CSSPrimitiveValue::CSS_URI: 107 case CSSPrimitiveValue::CSS_URI:
108 return false; 108 return false;
109 } 109 }
110 110
111 ASSERT_NOT_REACHED(); 111 ASSERT_NOT_REACHED();
112 return false; 112 return false;
113 } 113 }
114 114
115 CSSPrimitiveValue::UnitTable createUnitTable()
116 {
117 CSSPrimitiveValue::UnitTable table;
118 table.set(String("em"), CSSPrimitiveValue::CSS_EMS);
119 table.set(String("ex"), CSSPrimitiveValue::CSS_EXS);
120 table.set(String("px"), CSSPrimitiveValue::CSS_PX);
121 table.set(String("cm"), CSSPrimitiveValue::CSS_CM);
122 table.set(String("mm"), CSSPrimitiveValue::CSS_MM);
123 table.set(String("in"), CSSPrimitiveValue::CSS_IN);
124 table.set(String("pt"), CSSPrimitiveValue::CSS_PT);
125 table.set(String("pc"), CSSPrimitiveValue::CSS_PC);
126 table.set(String("deg"), CSSPrimitiveValue::CSS_DEG);
127 table.set(String("rad"), CSSPrimitiveValue::CSS_RAD);
128 table.set(String("grad"), CSSPrimitiveValue::CSS_GRAD);
129 table.set(String("ms"), CSSPrimitiveValue::CSS_MS);
130 table.set(String("s"), CSSPrimitiveValue::CSS_S);
131 table.set(String("hz"), CSSPrimitiveValue::CSS_HZ);
132 table.set(String("khz"), CSSPrimitiveValue::CSS_KHZ);
133 table.set(String("dpi"), CSSPrimitiveValue::CSS_DPI);
134 table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM);
135 table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX);
136 table.set(String("vw"), CSSPrimitiveValue::CSS_VW);
137 table.set(String("vh"), CSSPrimitiveValue::CSS_VH);
138 table.set(String("vmax"), CSSPrimitiveValue::CSS_VMIN);
139 table.set(String("vmin"), CSSPrimitiveValue::CSS_VMAX);
140 return table;
141 }
142
143 CSSPrimitiveValue::UnitTable& CSSPrimitiveValue::getUnitTable()
144 {
145 DEFINE_STATIC_LOCAL(UnitTable, unitTable, (createUnitTable()));
146 return unitTable;
147 }
148
149 CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(CSSPrimitiveValu e::UnitTypes type) 115 CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(CSSPrimitiveValu e::UnitTypes type)
150 { 116 {
151 // Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html #CSS-CSSPrimitiveValue) and allow conversions 117 // Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html #CSS-CSSPrimitiveValue) and allow conversions
152 // between CSS_PX and relative lengths (see cssPixelsPerInch comment in core /css/CSSHelper.h for the topic treatment). 118 // between CSS_PX and relative lengths (see cssPixelsPerInch comment in core /css/CSSHelper.h for the topic treatment).
153 switch (type) { 119 switch (type) {
154 case CSS_NUMBER: 120 case CSS_NUMBER:
155 return CSSPrimitiveValue::UNumber; 121 return CSSPrimitiveValue::UNumber;
156 case CSS_PERCENTAGE: 122 case CSS_PERCENTAGE:
157 return CSSPrimitiveValue::UPercent; 123 return CSSPrimitiveValue::UPercent;
158 case CSS_PX: 124 case CSS_PX:
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 case CSS_SHAPE: 1281 case CSS_SHAPE:
1316 visitor->trace(m_value.shape); 1282 visitor->trace(m_value.shape);
1317 break; 1283 break;
1318 default: 1284 default:
1319 break; 1285 break;
1320 } 1286 }
1321 CSSValue::traceAfterDispatch(visitor); 1287 CSSValue::traceAfterDispatch(visitor);
1322 } 1288 }
1323 1289
1324 } // namespace WebCore 1290 } // namespace WebCore
OLDNEW
« no previous file with comments | « trunk/Source/core/css/CSSPrimitiveValue.h ('k') | trunk/Source/core/css/MediaList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698