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

Side by Side Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 768893002: Remove border-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) 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 CSSPropertyBackgroundImage, 81 CSSPropertyBackgroundImage,
82 CSSPropertyBackgroundOrigin, 82 CSSPropertyBackgroundOrigin,
83 CSSPropertyBackgroundPosition, // more-specific background-position-x/y are non-standard 83 CSSPropertyBackgroundPosition, // more-specific background-position-x/y are non-standard
84 CSSPropertyBackgroundRepeat, 84 CSSPropertyBackgroundRepeat,
85 CSSPropertyBackgroundSize, 85 CSSPropertyBackgroundSize,
86 CSSPropertyBorderBottomColor, 86 CSSPropertyBorderBottomColor,
87 CSSPropertyBorderBottomLeftRadius, 87 CSSPropertyBorderBottomLeftRadius,
88 CSSPropertyBorderBottomRightRadius, 88 CSSPropertyBorderBottomRightRadius,
89 CSSPropertyBorderBottomStyle, 89 CSSPropertyBorderBottomStyle,
90 CSSPropertyBorderBottomWidth, 90 CSSPropertyBorderBottomWidth,
91 CSSPropertyBorderCollapse,
92 CSSPropertyBorderImageOutset, 91 CSSPropertyBorderImageOutset,
93 CSSPropertyBorderImageRepeat, 92 CSSPropertyBorderImageRepeat,
94 CSSPropertyBorderImageSlice, 93 CSSPropertyBorderImageSlice,
95 CSSPropertyBorderImageSource, 94 CSSPropertyBorderImageSource,
96 CSSPropertyBorderImageWidth, 95 CSSPropertyBorderImageWidth,
97 CSSPropertyBorderLeftColor, 96 CSSPropertyBorderLeftColor,
98 CSSPropertyBorderLeftStyle, 97 CSSPropertyBorderLeftStyle,
99 CSSPropertyBorderLeftWidth, 98 CSSPropertyBorderLeftWidth,
100 CSSPropertyBorderRightColor, 99 CSSPropertyBorderRightColor,
101 CSSPropertyBorderRightStyle, 100 CSSPropertyBorderRightStyle,
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 return list.release(); 1391 return list.release();
1393 } 1392 }
1394 case CSSPropertyBackgroundPositionY: 1393 case CSSPropertyBackgroundPositionY:
1395 case CSSPropertyWebkitMaskPositionY: { 1394 case CSSPropertyWebkitMaskPositionY: {
1396 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 1395 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
1397 const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPosi tionY ? &style->maskLayers() : &style->backgroundLayers(); 1396 const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPosi tionY ? &style->maskLayers() : &style->backgroundLayers();
1398 for (; currLayer; currLayer = currLayer->next()) 1397 for (; currLayer; currLayer = currLayer->next())
1399 list->append(pixelValueForLength(currLayer->yPosition(), *style) ); 1398 list->append(pixelValueForLength(currLayer->yPosition(), *style) );
1400 return list.release(); 1399 return list.release();
1401 } 1400 }
1402 case CSSPropertyBorderCollapse:
1403 if (style->borderCollapse())
1404 return cssValuePool().createIdentifierValue(CSSValueCollapse);
1405 return cssValuePool().createIdentifierValue(CSSValueSeparate);
1406 case CSSPropertyBorderSpacing: { 1401 case CSSPropertyBorderSpacing: {
1407 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 1402 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
1408 list->append(pixelValue(style->horizontalBorderSpacing(), *style)); 1403 list->append(pixelValue(style->horizontalBorderSpacing(), *style));
1409 list->append(pixelValue(style->verticalBorderSpacing(), *style)); 1404 list->append(pixelValue(style->verticalBorderSpacing(), *style));
1410 return list.release(); 1405 return list.release();
1411 } 1406 }
1412 case CSSPropertyWebkitBorderHorizontalSpacing: 1407 case CSSPropertyWebkitBorderHorizontalSpacing:
1413 return pixelValue(style->horizontalBorderSpacing(), *style); 1408 return pixelValue(style->horizontalBorderSpacing(), *style);
1414 case CSSPropertyWebkitBorderVerticalSpacing: 1409 case CSSPropertyWebkitBorderVerticalSpacing:
1415 return pixelValue(style->verticalBorderSpacing(), *style); 1410 return pixelValue(style->verticalBorderSpacing(), *style);
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
2445 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2440 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2446 CSSPropertyB ackgroundClip }; 2441 CSSPropertyB ackgroundClip };
2447 2442
2448 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2443 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2449 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 2444 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
2450 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 2445 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
2451 return list.release(); 2446 return list.release();
2452 } 2447 }
2453 2448
2454 } // namespace blink 2449 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/css/CSSPrimitiveValueMappings.h » ('j') | sky/engine/core/rendering/style/RenderStyle.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698