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

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

Issue 2944793002: Make EFlexWrap an enum class. (Closed)
Patch Set: Rebase Created 3 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 | « no previous file | third_party/WebKit/Source/core/css/CSSProperties.json5 » ('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. 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 } 665 }
666 666
667 NOTREACHED(); 667 NOTREACHED();
668 return EFlexDirection::kRow; 668 return EFlexDirection::kRow;
669 } 669 }
670 670
671 template <> 671 template <>
672 inline CSSIdentifierValue::CSSIdentifierValue(EFlexWrap e) 672 inline CSSIdentifierValue::CSSIdentifierValue(EFlexWrap e)
673 : CSSValue(kIdentifierClass) { 673 : CSSValue(kIdentifierClass) {
674 switch (e) { 674 switch (e) {
675 case kFlexNoWrap: 675 case EFlexWrap::kNowrap:
676 value_id_ = CSSValueNowrap; 676 value_id_ = CSSValueNowrap;
677 break; 677 break;
678 case kFlexWrap: 678 case EFlexWrap::kWrap:
679 value_id_ = CSSValueWrap; 679 value_id_ = CSSValueWrap;
680 break; 680 break;
681 case kFlexWrapReverse: 681 case EFlexWrap::kWrapReverse:
682 value_id_ = CSSValueWrapReverse; 682 value_id_ = CSSValueWrapReverse;
683 break; 683 break;
684 } 684 }
685 } 685 }
686 686
687 template <> 687 template <>
688 inline EFlexWrap CSSIdentifierValue::ConvertTo() const { 688 inline EFlexWrap CSSIdentifierValue::ConvertTo() const {
689 switch (value_id_) { 689 switch (value_id_) {
690 case CSSValueNowrap: 690 case CSSValueNowrap:
691 return kFlexNoWrap; 691 return EFlexWrap::kNowrap;
692 case CSSValueWrap: 692 case CSSValueWrap:
693 return kFlexWrap; 693 return EFlexWrap::kWrap;
694 case CSSValueWrapReverse: 694 case CSSValueWrapReverse:
695 return kFlexWrapReverse; 695 return EFlexWrap::kWrapReverse;
696 default: 696 default:
697 break; 697 break;
698 } 698 }
699 699
700 NOTREACHED(); 700 NOTREACHED();
701 return kFlexNoWrap; 701 return EFlexWrap::kNowrap;
702 } 702 }
703 703
704 template <> 704 template <>
705 inline CSSIdentifierValue::CSSIdentifierValue(EFloat e) 705 inline CSSIdentifierValue::CSSIdentifierValue(EFloat e)
706 : CSSValue(kIdentifierClass) { 706 : CSSValue(kIdentifierClass) {
707 switch (e) { 707 switch (e) {
708 case EFloat::kNone: 708 case EFloat::kNone:
709 value_id_ = CSSValueNone; 709 value_id_ = CSSValueNone;
710 break; 710 break;
711 case EFloat::kLeft: 711 case EFloat::kLeft:
(...skipping 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after
2443 default: 2443 default:
2444 break; 2444 break;
2445 } 2445 }
2446 NOTREACHED(); 2446 NOTREACHED();
2447 return kContainsNone; 2447 return kContainsNone;
2448 } 2448 }
2449 2449
2450 } // namespace blink 2450 } // namespace blink
2451 2451
2452 #endif 2452 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSProperties.json5 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698