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

Side by Side Diff: sky/engine/core/css/CSSPrimitiveValueMappings.h

Issue 729693003: First step at getting rid of anonymous blocks and continuations. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebaseline flights-app.sky Created 6 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
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 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 } 919 }
920 920
921 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e) 921 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e)
922 : CSSValue(PrimitiveClass) 922 : CSSValue(PrimitiveClass)
923 { 923 {
924 m_primitiveUnitType = CSS_VALUE_ID; 924 m_primitiveUnitType = CSS_VALUE_ID;
925 switch (e) { 925 switch (e) {
926 case INLINE: 926 case INLINE:
927 m_value.valueID = CSSValueInline; 927 m_value.valueID = CSSValueInline;
928 break; 928 break;
929 case PARAGRAPH:
930 m_value.valueID = CSSValueParagraph;
931 break;
929 case BLOCK: 932 case BLOCK:
930 m_value.valueID = CSSValueBlock; 933 m_value.valueID = CSSValueBlock;
931 break; 934 break;
932 case INLINE_BLOCK: 935 case INLINE_BLOCK:
933 m_value.valueID = CSSValueInlineBlock; 936 m_value.valueID = CSSValueInlineBlock;
934 break; 937 break;
935 case FLEX: 938 case FLEX:
936 m_value.valueID = CSSValueFlex; 939 m_value.valueID = CSSValueFlex;
937 break; 940 break;
938 case INLINE_FLEX: 941 case INLINE_FLEX:
(...skipping 2680 matching lines...) Expand 10 before | Expand all | Expand 10 after
3619 default: 3622 default:
3620 break; 3623 break;
3621 } 3624 }
3622 ASSERT_NOT_REACHED(); 3625 ASSERT_NOT_REACHED();
3623 return ScrollBehaviorInstant; 3626 return ScrollBehaviorInstant;
3624 } 3627 }
3625 3628
3626 } 3629 }
3627 3630
3628 #endif 3631 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698