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

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

Issue 2358473002: Renamed EFloat members to match keywords (Closed)
Patch Set: Rebase Created 4 years, 3 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/css/resolver/StyleAdjuster.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 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 1362
1363 ASSERT_NOT_REACHED(); 1363 ASSERT_NOT_REACHED();
1364 return FlexNoWrap; 1364 return FlexNoWrap;
1365 } 1365 }
1366 1366
1367 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFloat e) 1367 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFloat e)
1368 : CSSValue(PrimitiveClass) 1368 : CSSValue(PrimitiveClass)
1369 { 1369 {
1370 init(UnitType::ValueID); 1370 init(UnitType::ValueID);
1371 switch (e) { 1371 switch (e) {
1372 case EFloat::NoFloat: 1372 case EFloat::None:
1373 m_value.valueID = CSSValueNone; 1373 m_value.valueID = CSSValueNone;
1374 break; 1374 break;
1375 case EFloat::LeftFloat: 1375 case EFloat::Left:
1376 m_value.valueID = CSSValueLeft; 1376 m_value.valueID = CSSValueLeft;
1377 break; 1377 break;
1378 case EFloat::RightFloat: 1378 case EFloat::Right:
1379 m_value.valueID = CSSValueRight; 1379 m_value.valueID = CSSValueRight;
1380 break; 1380 break;
1381 } 1381 }
1382 } 1382 }
1383 1383
1384 template<> inline EFloat CSSPrimitiveValue::convertTo() const 1384 template<> inline EFloat CSSPrimitiveValue::convertTo() const
1385 { 1385 {
1386 ASSERT(isValueID()); 1386 ASSERT(isValueID());
1387 switch (m_value.valueID) { 1387 switch (m_value.valueID) {
1388 case CSSValueLeft: 1388 case CSSValueLeft:
1389 return EFloat::LeftFloat; 1389 return EFloat::Left;
1390 case CSSValueRight: 1390 case CSSValueRight:
1391 return EFloat::RightFloat; 1391 return EFloat::Right;
1392 case CSSValueNone: 1392 case CSSValueNone:
1393 return EFloat::NoFloat; 1393 return EFloat::None;
1394 default: 1394 default:
1395 break; 1395 break;
1396 } 1396 }
1397 1397
1398 ASSERT_NOT_REACHED(); 1398 ASSERT_NOT_REACHED();
1399 return EFloat::NoFloat; 1399 return EFloat::None;
1400 } 1400 }
1401 1401
1402 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Hyphens e) 1402 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Hyphens e)
1403 : CSSValue(PrimitiveClass) 1403 : CSSValue(PrimitiveClass)
1404 { 1404 {
1405 init(UnitType::ValueID); 1405 init(UnitType::ValueID);
1406 switch (e) { 1406 switch (e) {
1407 case HyphensAuto: 1407 case HyphensAuto:
1408 m_value.valueID = CSSValueAuto; 1408 m_value.valueID = CSSValueAuto;
1409 break; 1409 break;
(...skipping 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after
4717 default: 4717 default:
4718 break; 4718 break;
4719 } 4719 }
4720 ASSERT_NOT_REACHED(); 4720 ASSERT_NOT_REACHED();
4721 return ContainsNone; 4721 return ContainsNone;
4722 } 4722 }
4723 4723
4724 } // namespace blink 4724 } // namespace blink
4725 4725
4726 #endif 4726 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698