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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 2528573002: Changed EBorderCollapse to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 4 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. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2097 matching lines...) Expand 10 before | Expand all | Expand 10 after
2108 CSSValueList* list = CSSValueList::createCommaSeparated(); 2108 CSSValueList* list = CSSValueList::createCommaSeparated();
2109 const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPositionY 2109 const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPositionY
2110 ? &style.maskLayers() 2110 ? &style.maskLayers()
2111 : &style.backgroundLayers(); 2111 : &style.backgroundLayers();
2112 for (; currLayer; currLayer = currLayer->next()) 2112 for (; currLayer; currLayer = currLayer->next())
2113 list->append( 2113 list->append(
2114 *zoomAdjustedPixelValueForLength(currLayer->yPosition(), style)); 2114 *zoomAdjustedPixelValueForLength(currLayer->yPosition(), style));
2115 return list; 2115 return list;
2116 } 2116 }
2117 case CSSPropertyBorderCollapse: 2117 case CSSPropertyBorderCollapse:
2118 if (style.borderCollapse()) 2118 if (style.borderCollapse() == EBorderCollapse::Collapse)
2119 return CSSIdentifierValue::create(CSSValueCollapse); 2119 return CSSIdentifierValue::create(CSSValueCollapse);
2120 return CSSIdentifierValue::create(CSSValueSeparate); 2120 return CSSIdentifierValue::create(CSSValueSeparate);
2121 case CSSPropertyBorderSpacing: { 2121 case CSSPropertyBorderSpacing: {
2122 CSSValueList* list = CSSValueList::createSpaceSeparated(); 2122 CSSValueList* list = CSSValueList::createSpaceSeparated();
2123 list->append( 2123 list->append(
2124 *zoomAdjustedPixelValue(style.horizontalBorderSpacing(), style)); 2124 *zoomAdjustedPixelValue(style.horizontalBorderSpacing(), style));
2125 list->append( 2125 list->append(
2126 *zoomAdjustedPixelValue(style.verticalBorderSpacing(), style)); 2126 *zoomAdjustedPixelValue(style.verticalBorderSpacing(), style));
2127 return list; 2127 return list;
2128 } 2128 }
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
3620 case CSSPropertyAll: 3620 case CSSPropertyAll:
3621 return nullptr; 3621 return nullptr;
3622 default: 3622 default:
3623 break; 3623 break;
3624 } 3624 }
3625 ASSERT_NOT_REACHED(); 3625 ASSERT_NOT_REACHED();
3626 return nullptr; 3626 return nullptr;
3627 } 3627 }
3628 3628
3629 } // namespace blink 3629 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h ('k') | third_party/WebKit/Source/core/layout/LayoutTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698