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

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

Issue 1497403002: [css-align] Overflow alignment value 'true' renamed to 'unsafe' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed repaint tests issues. Created 5 years 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
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 4489 matching lines...) Expand 10 before | Expand all | Expand 10 after
4500 } 4500 }
4501 4501
4502 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(OverflowAlignment overflo wAlignment) 4502 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(OverflowAlignment overflo wAlignment)
4503 : CSSValue(PrimitiveClass) 4503 : CSSValue(PrimitiveClass)
4504 { 4504 {
4505 init(UnitType::ValueID); 4505 init(UnitType::ValueID);
4506 switch (overflowAlignment) { 4506 switch (overflowAlignment) {
4507 case OverflowAlignmentDefault: 4507 case OverflowAlignmentDefault:
4508 m_value.valueID = CSSValueDefault; 4508 m_value.valueID = CSSValueDefault;
4509 break; 4509 break;
4510 case OverflowAlignmentTrue: 4510 case OverflowAlignmentUnsafe:
4511 m_value.valueID = CSSValueTrue; 4511 m_value.valueID = CSSValueUnsafe;
4512 break; 4512 break;
4513 case OverflowAlignmentSafe: 4513 case OverflowAlignmentSafe:
4514 m_value.valueID = CSSValueSafe; 4514 m_value.valueID = CSSValueSafe;
4515 break; 4515 break;
4516 } 4516 }
4517 } 4517 }
4518 4518
4519 template<> inline OverflowAlignment CSSPrimitiveValue::convertTo() const 4519 template<> inline OverflowAlignment CSSPrimitiveValue::convertTo() const
4520 { 4520 {
4521 switch (m_value.valueID) { 4521 switch (m_value.valueID) {
4522 case CSSValueTrue: 4522 case CSSValueUnsafe:
4523 return OverflowAlignmentTrue; 4523 return OverflowAlignmentUnsafe;
4524 case CSSValueSafe: 4524 case CSSValueSafe:
4525 return OverflowAlignmentSafe; 4525 return OverflowAlignmentSafe;
4526 default: 4526 default:
4527 break; 4527 break;
4528 } 4528 }
4529 ASSERT_NOT_REACHED(); 4529 ASSERT_NOT_REACHED();
4530 return OverflowAlignmentTrue; 4530 return OverflowAlignmentUnsafe;
4531 } 4531 }
4532 4532
4533 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollBehavior behavior) 4533 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollBehavior behavior)
4534 : CSSValue(PrimitiveClass) 4534 : CSSValue(PrimitiveClass)
4535 { 4535 {
4536 init(UnitType::ValueID); 4536 init(UnitType::ValueID);
4537 switch (behavior) { 4537 switch (behavior) {
4538 case ScrollBehaviorAuto: 4538 case ScrollBehaviorAuto:
4539 m_value.valueID = CSSValueAuto; 4539 m_value.valueID = CSSValueAuto;
4540 break; 4540 break;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
4591 default: 4591 default:
4592 break; 4592 break;
4593 } 4593 }
4594 ASSERT_NOT_REACHED(); 4594 ASSERT_NOT_REACHED();
4595 return ScrollSnapTypeNone; 4595 return ScrollSnapTypeNone;
4596 } 4596 }
4597 4597
4598 } // namespace blink 4598 } // namespace blink
4599 4599
4600 #endif 4600 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698