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

Side by Side Diff: sky/engine/core/css/parser/CSSPropertyParser.cpp

Issue 760583004: Remove webkit-margin-collapse (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years 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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 case CSSPropertyWebkitTransitionDuration: 1118 case CSSPropertyWebkitTransitionDuration:
1119 case CSSPropertyWebkitTransitionTimingFunction: 1119 case CSSPropertyWebkitTransitionTimingFunction:
1120 case CSSPropertyWebkitTransitionProperty: { 1120 case CSSPropertyWebkitTransitionProperty: {
1121 if (RefPtr<CSSValueList> val = parseAnimationPropertyList(propId)) { 1121 if (RefPtr<CSSValueList> val = parseAnimationPropertyList(propId)) {
1122 addPropertyWithPrefixingVariant(propId, val.release(), important); 1122 addPropertyWithPrefixingVariant(propId, val.release(), important);
1123 return true; 1123 return true;
1124 } 1124 }
1125 return false; 1125 return false;
1126 } 1126 }
1127 1127
1128 case CSSPropertyWebkitMarginCollapse: {
1129 if (num == 1) {
1130 ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
1131 if (!parseValue(webkitMarginCollapseShorthand().properties()[0], imp ortant))
1132 return false;
1133 CSSValue* value = m_parsedProperties.last().value();
1134 addProperty(webkitMarginCollapseShorthand().properties()[1], value, important);
1135 return true;
1136 }
1137 else if (num == 2) {
1138 ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
1139 if (!parseValue(webkitMarginCollapseShorthand().properties()[0], imp ortant) || !parseValue(webkitMarginCollapseShorthand().properties()[1], importan t))
1140 return false;
1141 return true;
1142 }
1143 return false;
1144 }
1145 case CSSPropertyWillChange: 1128 case CSSPropertyWillChange:
1146 parsedValue = parseWillChange(); 1129 parsedValue = parseWillChange();
1147 break; 1130 break;
1148 // End of CSS3 properties 1131 // End of CSS3 properties
1149 1132
1150 // Apple specific properties. These will never be standardized and are pure ly to 1133 // Apple specific properties. These will never be standardized and are pure ly to
1151 // support custom WebKit-based Apple applications. 1134 // support custom WebKit-based Apple applications.
1152 case CSSPropertyWebkitFontSizeDelta: // <length> 1135 case CSSPropertyWebkitFontSizeDelta: // <length>
1153 validPrimitive = validUnit(value, FLength); 1136 validPrimitive = validUnit(value, FLength);
1154 break; 1137 break;
(...skipping 5060 matching lines...) Expand 10 before | Expand all | Expand 10 after
6215 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 6198 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
6216 } 6199 }
6217 6200
6218 bool CSSPropertyParser::isSystemColor(int id) 6201 bool CSSPropertyParser::isSystemColor(int id)
6219 { 6202 {
6220 // FIXME(sky): remove 6203 // FIXME(sky): remove
6221 return false; 6204 return false;
6222 } 6205 }
6223 6206
6224 } // namespace blink 6207 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698