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

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

Issue 1060223002: Remove parsing for display:block/inline-block. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 | « no previous file | sky/engine/core/css/CSSValueKeywords.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 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 : CSSValue(PrimitiveClass) 860 : CSSValue(PrimitiveClass)
861 { 861 {
862 m_primitiveUnitType = CSS_VALUE_ID; 862 m_primitiveUnitType = CSS_VALUE_ID;
863 switch (e) { 863 switch (e) {
864 case INLINE: 864 case INLINE:
865 m_value.valueID = CSSValueInline; 865 m_value.valueID = CSSValueInline;
866 break; 866 break;
867 case PARAGRAPH: 867 case PARAGRAPH:
868 m_value.valueID = CSSValueParagraph; 868 m_value.valueID = CSSValueParagraph;
869 break; 869 break;
870 case BLOCK:
871 m_value.valueID = CSSValueBlock;
872 break;
873 case INLINE_BLOCK:
874 m_value.valueID = CSSValueInlineBlock;
875 break;
876 case FLEX: 870 case FLEX:
877 m_value.valueID = CSSValueFlex; 871 m_value.valueID = CSSValueFlex;
878 break; 872 break;
879 case INLINE_FLEX: 873 case INLINE_FLEX:
880 m_value.valueID = CSSValueInlineFlex; 874 m_value.valueID = CSSValueInlineFlex;
881 break; 875 break;
882 case NONE: 876 case NONE:
883 m_value.valueID = CSSValueNone; 877 m_value.valueID = CSSValueNone;
884 break; 878 break;
885 } 879 }
(...skipping 2536 matching lines...) Expand 10 before | Expand all | Expand 10 after
3422 default: 3416 default:
3423 break; 3417 break;
3424 } 3418 }
3425 ASSERT_NOT_REACHED(); 3419 ASSERT_NOT_REACHED();
3426 return OverflowAlignmentTrue; 3420 return OverflowAlignmentTrue;
3427 } 3421 }
3428 3422
3429 } 3423 }
3430 3424
3431 #endif // SKY_ENGINE_CORE_CSS_CSSPRIMITIVEVALUEMAPPINGS_H_ 3425 #endif // SKY_ENGINE_CORE_CSS_CSSPRIMITIVEVALUEMAPPINGS_H_
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698