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

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

Issue 2750843002: [css-align] Adapt content-alignment properties to the new baseline syntax (Closed)
Patch Set: Don't use raw pointers attributes on a GC managed class. Created 3 years, 9 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
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 3448 matching lines...) Expand 10 before | Expand all | Expand 10 after
3459 inline ItemPosition CSSIdentifierValue::convertTo() const { 3459 inline ItemPosition CSSIdentifierValue::convertTo() const {
3460 switch (m_valueID) { 3460 switch (m_valueID) {
3461 case CSSValueAuto: 3461 case CSSValueAuto:
3462 return ItemPositionAuto; 3462 return ItemPositionAuto;
3463 case CSSValueNormal: 3463 case CSSValueNormal:
3464 return ItemPositionNormal; 3464 return ItemPositionNormal;
3465 case CSSValueStretch: 3465 case CSSValueStretch:
3466 return ItemPositionStretch; 3466 return ItemPositionStretch;
3467 case CSSValueBaseline: 3467 case CSSValueBaseline:
3468 return ItemPositionBaseline; 3468 return ItemPositionBaseline;
3469 case CSSValueFirstBaseline:
3470 return ItemPositionBaseline;
3469 case CSSValueLastBaseline: 3471 case CSSValueLastBaseline:
3470 return ItemPositionLastBaseline; 3472 return ItemPositionLastBaseline;
3471 case CSSValueCenter: 3473 case CSSValueCenter:
3472 return ItemPositionCenter; 3474 return ItemPositionCenter;
3473 case CSSValueStart: 3475 case CSSValueStart:
3474 return ItemPositionStart; 3476 return ItemPositionStart;
3475 case CSSValueEnd: 3477 case CSSValueEnd:
3476 return ItemPositionEnd; 3478 return ItemPositionEnd;
3477 case CSSValueSelfStart: 3479 case CSSValueSelfStart:
3478 return ItemPositionSelfStart; 3480 return ItemPositionSelfStart;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
3530 } 3532 }
3531 } 3533 }
3532 3534
3533 template <> 3535 template <>
3534 inline ContentPosition CSSIdentifierValue::convertTo() const { 3536 inline ContentPosition CSSIdentifierValue::convertTo() const {
3535 switch (m_valueID) { 3537 switch (m_valueID) {
3536 case CSSValueNormal: 3538 case CSSValueNormal:
3537 return ContentPositionNormal; 3539 return ContentPositionNormal;
3538 case CSSValueBaseline: 3540 case CSSValueBaseline:
3539 return ContentPositionBaseline; 3541 return ContentPositionBaseline;
3542 case CSSValueFirstBaseline:
3543 return ContentPositionBaseline;
3540 case CSSValueLastBaseline: 3544 case CSSValueLastBaseline:
3541 return ContentPositionLastBaseline; 3545 return ContentPositionLastBaseline;
3542 case CSSValueCenter: 3546 case CSSValueCenter:
3543 return ContentPositionCenter; 3547 return ContentPositionCenter;
3544 case CSSValueStart: 3548 case CSSValueStart:
3545 return ContentPositionStart; 3549 return ContentPositionStart;
3546 case CSSValueEnd: 3550 case CSSValueEnd:
3547 return ContentPositionEnd; 3551 return ContentPositionEnd;
3548 case CSSValueFlexStart: 3552 case CSSValueFlexStart:
3549 return ContentPositionFlexStart; 3553 return ContentPositionFlexStart;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
3743 default: 3747 default:
3744 break; 3748 break;
3745 } 3749 }
3746 ASSERT_NOT_REACHED(); 3750 ASSERT_NOT_REACHED();
3747 return ContainsNone; 3751 return ContainsNone;
3748 } 3752 }
3749 3753
3750 } // namespace blink 3754 } // namespace blink
3751 3755
3752 #endif 3756 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698