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

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

Issue 1409063004: Fix -webkit-column-span isValueID ASSERT (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « third_party/WebKit/LayoutTests/fast/css/webkit-column-span-legacy-expected.txt ('k') | no next file » | 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 break; 201 break;
202 case ColumnSpanNone: 202 case ColumnSpanNone:
203 m_value.valueID = CSSValueNone; 203 m_value.valueID = CSSValueNone;
204 break; 204 break;
205 } 205 }
206 } 206 }
207 207
208 template<> inline ColumnSpan CSSPrimitiveValue::convertTo() const 208 template<> inline ColumnSpan CSSPrimitiveValue::convertTo() const
209 { 209 {
210 // Map 1 to none for compatibility reasons. 210 // Map 1 to none for compatibility reasons.
211 if (type() == UnitType::Number && m_value.num == 1) 211 if (type() == UnitType::Integer && m_value.num == 1)
212 return ColumnSpanNone; 212 return ColumnSpanNone;
213 213
214 ASSERT(isValueID()); 214 ASSERT(isValueID());
215 switch (m_value.valueID) { 215 switch (m_value.valueID) {
216 case CSSValueAll: 216 case CSSValueAll:
217 return ColumnSpanAll; 217 return ColumnSpanAll;
218 case CSSValueNone: 218 case CSSValueNone:
219 return ColumnSpanNone; 219 return ColumnSpanNone;
220 default: 220 default:
221 break; 221 break;
(...skipping 4391 matching lines...) Expand 10 before | Expand all | Expand 10 after
4613 default: 4613 default:
4614 break; 4614 break;
4615 } 4615 }
4616 ASSERT_NOT_REACHED(); 4616 ASSERT_NOT_REACHED();
4617 return ScrollSnapTypeNone; 4617 return ScrollSnapTypeNone;
4618 } 4618 }
4619 4619
4620 } // namespace blink 4620 } // namespace blink
4621 4621
4622 #endif 4622 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/webkit-column-span-legacy-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698