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

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

Issue 1169803004: Make __qems a CSSPrimitiveValue unit type (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review comments Created 5 years, 6 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 | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/parser/CSSParserValues.h » ('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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM); 75 table.set(String("dpcm"), CSSPrimitiveValue::CSS_DPCM);
76 table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX); 76 table.set(String("dppx"), CSSPrimitiveValue::CSS_DPPX);
77 table.set(String("vw"), CSSPrimitiveValue::CSS_VW); 77 table.set(String("vw"), CSSPrimitiveValue::CSS_VW);
78 table.set(String("vh"), CSSPrimitiveValue::CSS_VH); 78 table.set(String("vh"), CSSPrimitiveValue::CSS_VH);
79 table.set(String("vmin"), CSSPrimitiveValue::CSS_VMIN); 79 table.set(String("vmin"), CSSPrimitiveValue::CSS_VMIN);
80 table.set(String("vmax"), CSSPrimitiveValue::CSS_VMAX); 80 table.set(String("vmax"), CSSPrimitiveValue::CSS_VMAX);
81 table.set(String("rem"), CSSPrimitiveValue::CSS_REMS); 81 table.set(String("rem"), CSSPrimitiveValue::CSS_REMS);
82 table.set(String("fr"), CSSPrimitiveValue::CSS_FR); 82 table.set(String("fr"), CSSPrimitiveValue::CSS_FR);
83 table.set(String("turn"), CSSPrimitiveValue::CSS_TURN); 83 table.set(String("turn"), CSSPrimitiveValue::CSS_TURN);
84 table.set(String("ch"), CSSPrimitiveValue::CSS_CHS); 84 table.set(String("ch"), CSSPrimitiveValue::CSS_CHS);
85 table.set(String("__qem"), CSSPrimitiveValue::CSS_QEM);
85 return table; 86 return table;
86 } 87 }
87 88
88 StringToUnitTable& unitTable() 89 StringToUnitTable& unitTable()
89 { 90 {
90 DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable() )); 91 DEFINE_STATIC_LOCAL(StringToUnitTable, unitTable, (createStringToUnitTable() ));
91 return unitTable; 92 return unitTable;
92 } 93 }
93 94
94 } // namespace 95 } // namespace
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 break; 433 break;
433 case CSS_SHAPE: 434 case CSS_SHAPE:
434 // We must not call deref() when oilpan is enabled because m_value.shape is traced. 435 // We must not call deref() when oilpan is enabled because m_value.shape is traced.
435 #if !ENABLE(OILPAN) 436 #if !ENABLE(OILPAN)
436 m_value.shape->deref(); 437 m_value.shape->deref();
437 #endif 438 #endif
438 break; 439 break;
439 case CSS_NUMBER: 440 case CSS_NUMBER:
440 case CSS_PERCENTAGE: 441 case CSS_PERCENTAGE:
441 case CSS_EMS: 442 case CSS_EMS:
443 case CSS_QEM:
442 case CSS_EXS: 444 case CSS_EXS:
443 case CSS_REMS: 445 case CSS_REMS:
444 case CSS_CHS: 446 case CSS_CHS:
445 case CSS_PX: 447 case CSS_PX:
446 case CSS_CM: 448 case CSS_CM:
447 case CSS_MM: 449 case CSS_MM:
448 case CSS_IN: 450 case CSS_IN:
449 case CSS_PT: 451 case CSS_PT:
450 case CSS_PC: 452 case CSS_PC:
451 case CSS_DEG: 453 case CSS_DEG:
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 case CSS_COUNTER: 919 case CSS_COUNTER:
918 case CSS_RECT: 920 case CSS_RECT:
919 case CSS_QUAD: 921 case CSS_QUAD:
920 case CSS_RGBCOLOR: 922 case CSS_RGBCOLOR:
921 case CSS_PAIR: 923 case CSS_PAIR:
922 case CSS_CALC: 924 case CSS_CALC:
923 case CSS_SHAPE: 925 case CSS_SHAPE:
924 case CSS_IDENT: 926 case CSS_IDENT:
925 case CSS_CALC_PERCENTAGE_WITH_NUMBER: 927 case CSS_CALC_PERCENTAGE_WITH_NUMBER:
926 case CSS_CALC_PERCENTAGE_WITH_LENGTH: 928 case CSS_CALC_PERCENTAGE_WITH_LENGTH:
929 case CSS_QEM:
927 break; 930 break;
928 }; 931 };
929 ASSERT_NOT_REACHED(); 932 ASSERT_NOT_REACHED();
930 return ""; 933 return "";
931 } 934 }
932 935
933 String CSSPrimitiveValue::customCSSText() const 936 String CSSPrimitiveValue::customCSSText() const
934 { 937 {
935 if (m_hasCachedCSSText) { 938 if (m_hasCachedCSSText) {
936 ASSERT(cssTextCache().contains(this)); 939 ASSERT(cssTextCache().contains(this));
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 visitor->trace(m_value.shape); 1138 visitor->trace(m_value.shape);
1136 break; 1139 break;
1137 default: 1140 default:
1138 break; 1141 break;
1139 } 1142 }
1140 #endif 1143 #endif
1141 CSSValue::traceAfterDispatch(visitor); 1144 CSSValue::traceAfterDispatch(visitor);
1142 } 1145 }
1143 1146
1144 } // namespace blink 1147 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/parser/CSSParserValues.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698