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

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Put changes to problematic files (for the bots) back in. Created 7 years, 2 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/CSSParser-in.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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 case CSSValueRight: 169 case CSSValueRight:
170 return ReflectionRight; 170 return ReflectionRight;
171 default: 171 default:
172 break; 172 break;
173 } 173 }
174 174
175 ASSERT_NOT_REACHED(); 175 ASSERT_NOT_REACHED();
176 return ReflectionBelow; 176 return ReflectionBelow;
177 } 177 }
178 178
179 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnFill columnFill)
180 : CSSValue(PrimitiveClass)
181 {
182 m_primitiveUnitType = CSS_VALUE_ID;
183 switch (columnFill) {
184 case ColumnFillAuto:
185 m_value.valueID = CSSValueAuto;
186 break;
187 case ColumnFillBalance:
188 m_value.valueID = CSSValueBalance;
189 break;
190 }
191 }
192
193 template<> inline CSSPrimitiveValue::operator ColumnFill() const
194 {
195 if (m_primitiveUnitType == CSS_VALUE_ID) {
196 if (m_value.valueID == CSSValueBalance)
197 return ColumnFillBalance;
198 if (m_value.valueID == CSSValueAuto)
199 return ColumnFillAuto;
200 }
201 ASSERT_NOT_REACHED();
202 return ColumnFillBalance;
203 }
204
179 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnSpan columnSpan) 205 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnSpan columnSpan)
180 : CSSValue(PrimitiveClass) 206 : CSSValue(PrimitiveClass)
181 { 207 {
182 m_primitiveUnitType = CSS_VALUE_ID; 208 m_primitiveUnitType = CSS_VALUE_ID;
183 switch (columnSpan) { 209 switch (columnSpan) {
184 case ColumnSpanAll: 210 case ColumnSpanAll:
185 m_value.valueID = CSSValueAll; 211 m_value.valueID = CSSValueAll;
186 break; 212 break;
187 case ColumnSpanNone: 213 case ColumnSpanNone:
188 m_value.valueID = CSSValueNone; 214 m_value.valueID = CSSValueNone;
(...skipping 4663 matching lines...) Expand 10 before | Expand all | Expand 10 after
4852 break; 4878 break;
4853 } 4879 }
4854 4880
4855 ASSERT_NOT_REACHED(); 4881 ASSERT_NOT_REACHED();
4856 return IsolationAuto; 4882 return IsolationAuto;
4857 } 4883 }
4858 4884
4859 } 4885 }
4860 4886
4861 #endif 4887 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser-in.cpp ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698