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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Issue 2367273003: Changed EEmptyCells to an enum class and renamed its members to keywords (Closed)
Patch Set: Rebase Created 4 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 | third_party/WebKit/Source/core/paint/TableCellPainter.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 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 1246 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); 1257 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline);
1258 // TODO(sashab): Check display is a valid EDisplay here. 1258 // TODO(sashab): Check display is a valid EDisplay here.
1259 return display; 1259 return display;
1260 } 1260 }
1261 1261
1262 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCells e) 1262 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCells e)
1263 : CSSValue(PrimitiveClass) 1263 : CSSValue(PrimitiveClass)
1264 { 1264 {
1265 init(UnitType::ValueID); 1265 init(UnitType::ValueID);
1266 switch (e) { 1266 switch (e) {
1267 case EmptyCellsShow: 1267 case EEmptyCells::Show:
1268 m_value.valueID = CSSValueShow; 1268 m_value.valueID = CSSValueShow;
1269 break; 1269 break;
1270 case EmptyCellsHide: 1270 case EEmptyCells::Hide:
1271 m_value.valueID = CSSValueHide; 1271 m_value.valueID = CSSValueHide;
1272 break; 1272 break;
1273 } 1273 }
1274 } 1274 }
1275 1275
1276 template<> inline EEmptyCells CSSPrimitiveValue::convertTo() const 1276 template<> inline EEmptyCells CSSPrimitiveValue::convertTo() const
1277 { 1277 {
1278 ASSERT(isValueID()); 1278 ASSERT(isValueID());
1279 switch (m_value.valueID) { 1279 switch (m_value.valueID) {
1280 case CSSValueShow: 1280 case CSSValueShow:
1281 return EmptyCellsShow; 1281 return EEmptyCells::Show;
1282 case CSSValueHide: 1282 case CSSValueHide:
1283 return EmptyCellsHide; 1283 return EEmptyCells::Hide;
1284 default: 1284 default:
1285 break; 1285 break;
1286 } 1286 }
1287 1287
1288 ASSERT_NOT_REACHED(); 1288 ASSERT_NOT_REACHED();
1289 return EmptyCellsShow; 1289 return EEmptyCells::Show;
1290 } 1290 }
1291 1291
1292 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexDirection e) 1292 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexDirection e)
1293 : CSSValue(PrimitiveClass) 1293 : CSSValue(PrimitiveClass)
1294 { 1294 {
1295 init(UnitType::ValueID); 1295 init(UnitType::ValueID);
1296 switch (e) { 1296 switch (e) {
1297 case FlowRow: 1297 case FlowRow:
1298 m_value.valueID = CSSValueRow; 1298 m_value.valueID = CSSValueRow;
1299 break; 1299 break;
(...skipping 3419 matching lines...) Expand 10 before | Expand all | Expand 10 after
4719 default: 4719 default:
4720 break; 4720 break;
4721 } 4721 }
4722 ASSERT_NOT_REACHED(); 4722 ASSERT_NOT_REACHED();
4723 return ContainsNone; 4723 return ContainsNone;
4724 } 4724 }
4725 4725
4726 } // namespace blink 4726 } // namespace blink
4727 4727
4728 #endif 4728 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/paint/TableCellPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698