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

Side by Side Diff: sky/engine/core/css/CSSComputedStyleDeclaration.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
« no previous file with comments | « no previous file | sky/engine/core/css/CSSPrimitiveValueMappings.h » ('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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 CSSPropertyFlexShrink, 223 CSSPropertyFlexShrink,
224 CSSPropertyFlexDirection, 224 CSSPropertyFlexDirection,
225 CSSPropertyFlexWrap, 225 CSSPropertyFlexWrap,
226 CSSPropertyJustifyContent, 226 CSSPropertyJustifyContent,
227 CSSPropertyWebkitFontSmoothing, 227 CSSPropertyWebkitFontSmoothing,
228 CSSPropertyWebkitHighlight, 228 CSSPropertyWebkitHighlight,
229 CSSPropertyWebkitHyphenateCharacter, 229 CSSPropertyWebkitHyphenateCharacter,
230 CSSPropertyWebkitLineBoxContain, 230 CSSPropertyWebkitLineBoxContain,
231 CSSPropertyWebkitLineBreak, 231 CSSPropertyWebkitLineBreak,
232 CSSPropertyWebkitLocale, 232 CSSPropertyWebkitLocale,
233 CSSPropertyWebkitMarginBeforeCollapse,
234 CSSPropertyWebkitMarginAfterCollapse,
235 CSSPropertyWebkitMaskBoxImage, 233 CSSPropertyWebkitMaskBoxImage,
236 CSSPropertyWebkitMaskBoxImageOutset, 234 CSSPropertyWebkitMaskBoxImageOutset,
237 CSSPropertyWebkitMaskBoxImageRepeat, 235 CSSPropertyWebkitMaskBoxImageRepeat,
238 CSSPropertyWebkitMaskBoxImageSlice, 236 CSSPropertyWebkitMaskBoxImageSlice,
239 CSSPropertyWebkitMaskBoxImageSource, 237 CSSPropertyWebkitMaskBoxImageSource,
240 CSSPropertyWebkitMaskBoxImageWidth, 238 CSSPropertyWebkitMaskBoxImageWidth,
241 CSSPropertyWebkitMaskClip, 239 CSSPropertyWebkitMaskClip,
242 CSSPropertyWebkitMaskComposite, 240 CSSPropertyWebkitMaskComposite,
243 CSSPropertyWebkitMaskImage, 241 CSSPropertyWebkitMaskImage,
244 CSSPropertyWebkitMaskOrigin, 242 CSSPropertyWebkitMaskOrigin,
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after
2021 return valueForNinePieceImageSlice(style->maskBoxImage()); 2019 return valueForNinePieceImageSlice(style->maskBoxImage());
2022 case CSSPropertyWebkitMaskBoxImageWidth: 2020 case CSSPropertyWebkitMaskBoxImageWidth:
2023 return valueForNinePieceImageQuad(style->maskBoxImage().borderSlices (), *style); 2021 return valueForNinePieceImageQuad(style->maskBoxImage().borderSlices (), *style);
2024 case CSSPropertyWebkitMaskBoxImageSource: 2022 case CSSPropertyWebkitMaskBoxImageSource:
2025 if (style->maskBoxImageSource()) 2023 if (style->maskBoxImageSource())
2026 return style->maskBoxImageSource()->cssValue(); 2024 return style->maskBoxImageSource()->cssValue();
2027 return cssValuePool().createIdentifierValue(CSSValueNone); 2025 return cssValuePool().createIdentifierValue(CSSValueNone);
2028 case CSSPropertyWebkitFontSizeDelta: 2026 case CSSPropertyWebkitFontSizeDelta:
2029 // Not a real style property -- used by the editing engine -- so has no computed value. 2027 // Not a real style property -- used by the editing engine -- so has no computed value.
2030 break; 2028 break;
2031 case CSSPropertyWebkitMarginBottomCollapse:
2032 case CSSPropertyWebkitMarginAfterCollapse:
2033 return cssValuePool().createValue(style->marginAfterCollapse());
2034 case CSSPropertyWebkitMarginTopCollapse:
2035 case CSSPropertyWebkitMarginBeforeCollapse:
2036 return cssValuePool().createValue(style->marginBeforeCollapse());
2037 case CSSPropertyPerspective: 2029 case CSSPropertyPerspective:
2038 case CSSPropertyWebkitPerspective: 2030 case CSSPropertyWebkitPerspective:
2039 if (!style->hasPerspective()) 2031 if (!style->hasPerspective())
2040 return cssValuePool().createIdentifierValue(CSSValueNone); 2032 return cssValuePool().createIdentifierValue(CSSValueNone);
2041 return pixelValue(style->perspective(), *style); 2033 return pixelValue(style->perspective(), *style);
2042 case CSSPropertyPerspectiveOrigin: 2034 case CSSPropertyPerspectiveOrigin:
2043 case CSSPropertyWebkitPerspectiveOrigin: { 2035 case CSSPropertyWebkitPerspectiveOrigin: {
2044 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 2036 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
2045 if (renderer) { 2037 if (renderer) {
2046 LayoutRect box; 2038 LayoutRect box;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
2249 break; 2241 break;
2250 2242
2251 /* Other unimplemented properties */ 2243 /* Other unimplemented properties */
2252 case CSSPropertyPage: // for @page 2244 case CSSPropertyPage: // for @page
2253 case CSSPropertyQuotes: // FIXME: needs implementation 2245 case CSSPropertyQuotes: // FIXME: needs implementation
2254 case CSSPropertySize: // for @page 2246 case CSSPropertySize: // for @page
2255 break; 2247 break;
2256 2248
2257 /* Unimplemented -webkit- properties */ 2249 /* Unimplemented -webkit- properties */
2258 case CSSPropertyWebkitBorderRadius: 2250 case CSSPropertyWebkitBorderRadius:
2259 case CSSPropertyWebkitMarginCollapse:
2260 case CSSPropertyWebkitMask: 2251 case CSSPropertyWebkitMask:
2261 case CSSPropertyWebkitMaskRepeatX: 2252 case CSSPropertyWebkitMaskRepeatX:
2262 case CSSPropertyWebkitMaskRepeatY: 2253 case CSSPropertyWebkitMaskRepeatY:
2263 case CSSPropertyWebkitPerspectiveOriginX: 2254 case CSSPropertyWebkitPerspectiveOriginX:
2264 case CSSPropertyWebkitPerspectiveOriginY: 2255 case CSSPropertyWebkitPerspectiveOriginY:
2265 case CSSPropertyWebkitTextStroke: 2256 case CSSPropertyWebkitTextStroke:
2266 case CSSPropertyWebkitTransformOriginX: 2257 case CSSPropertyWebkitTransformOriginX:
2267 case CSSPropertyWebkitTransformOriginY: 2258 case CSSPropertyWebkitTransformOriginY:
2268 case CSSPropertyWebkitTransformOriginZ: 2259 case CSSPropertyWebkitTransformOriginZ:
2269 break; 2260 break;
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
2454 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2445 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2455 CSSPropertyB ackgroundClip }; 2446 CSSPropertyB ackgroundClip };
2456 2447
2457 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2448 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2458 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2449 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2459 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2450 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2460 return list.release(); 2451 return list.release();
2461 } 2452 }
2462 2453
2463 } // namespace blink 2454 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698