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

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

Issue 201573009: Remove -webkit-column-progression and -webkit-column-axis properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase master (fixed the DOS-style line break issue there) Created 6 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
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSProperties.in » ('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 4061 matching lines...) Expand 10 before | Expand all | Expand 10 after
4072 case CSSValuePreserve3d: 4072 case CSSValuePreserve3d:
4073 return TransformStyle3DPreserve3D; 4073 return TransformStyle3DPreserve3D;
4074 default: 4074 default:
4075 break; 4075 break;
4076 } 4076 }
4077 4077
4078 ASSERT_NOT_REACHED(); 4078 ASSERT_NOT_REACHED();
4079 return TransformStyle3DFlat; 4079 return TransformStyle3DFlat;
4080 } 4080 }
4081 4081
4082 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnAxis e)
4083 : CSSValue(PrimitiveClass)
4084 {
4085 m_primitiveUnitType = CSS_VALUE_ID;
4086 switch (e) {
4087 case HorizontalColumnAxis:
4088 m_value.valueID = CSSValueHorizontal;
4089 break;
4090 case VerticalColumnAxis:
4091 m_value.valueID = CSSValueVertical;
4092 break;
4093 case AutoColumnAxis:
4094 m_value.valueID = CSSValueAuto;
4095 break;
4096 }
4097 }
4098
4099 template<> inline CSSPrimitiveValue::operator ColumnAxis() const
4100 {
4101 ASSERT(isValueID());
4102 switch (m_value.valueID) {
4103 case CSSValueHorizontal:
4104 return HorizontalColumnAxis;
4105 case CSSValueVertical:
4106 return VerticalColumnAxis;
4107 case CSSValueAuto:
4108 return AutoColumnAxis;
4109 default:
4110 break;
4111 }
4112
4113 ASSERT_NOT_REACHED();
4114 return AutoColumnAxis;
4115 }
4116
4117 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnProgression e)
4118 : CSSValue(PrimitiveClass)
4119 {
4120 m_primitiveUnitType = CSS_VALUE_ID;
4121 switch (e) {
4122 case NormalColumnProgression:
4123 m_value.valueID = CSSValueNormal;
4124 break;
4125 case ReverseColumnProgression:
4126 m_value.valueID = CSSValueReverse;
4127 break;
4128 }
4129 }
4130
4131 template<> inline CSSPrimitiveValue::operator ColumnProgression() const
4132 {
4133 ASSERT(isValueID());
4134 switch (m_value.valueID) {
4135 case CSSValueNormal:
4136 return NormalColumnProgression;
4137 case CSSValueReverse:
4138 return ReverseColumnProgression;
4139 default:
4140 break;
4141 }
4142
4143 ASSERT_NOT_REACHED();
4144 return NormalColumnProgression;
4145 }
4146
4147 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow) 4082 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow)
4148 : CSSValue(PrimitiveClass) 4083 : CSSValue(PrimitiveClass)
4149 { 4084 {
4150 m_primitiveUnitType = CSS_VALUE_ID; 4085 m_primitiveUnitType = CSS_VALUE_ID;
4151 switch (wrapFlow) { 4086 switch (wrapFlow) {
4152 case WrapFlowAuto: 4087 case WrapFlowAuto:
4153 m_value.valueID = CSSValueAuto; 4088 m_value.valueID = CSSValueAuto;
4154 break; 4089 break;
4155 case WrapFlowBoth: 4090 case WrapFlowBoth:
4156 m_value.valueID = CSSValueBoth; 4091 m_value.valueID = CSSValueBoth;
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
4949 default: 4884 default:
4950 break; 4885 break;
4951 } 4886 }
4952 ASSERT_NOT_REACHED(); 4887 ASSERT_NOT_REACHED();
4953 return ScrollBehaviorInstant; 4888 return ScrollBehaviorInstant;
4954 } 4889 }
4955 4890
4956 } 4891 }
4957 4892
4958 #endif 4893 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698