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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 220023003: Rename LayoutBox to CSSBoxType (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « Source/core/css/CSSBasicShapes.cpp ('k') | Source/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 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 return cssValuePool().createIdentifierValue(CSSValueNormal); 1431 return cssValuePool().createIdentifierValue(CSSValueNormal);
1432 } 1432 }
1433 1433
1434 static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue) 1434 static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue)
1435 { 1435 {
1436 if (!shapeValue) 1436 if (!shapeValue)
1437 return cssValuePool().createIdentifierValue(CSSValueNone); 1437 return cssValuePool().createIdentifierValue(CSSValueNone);
1438 if (shapeValue->type() == ShapeValue::Outside) 1438 if (shapeValue->type() == ShapeValue::Outside)
1439 return cssValuePool().createIdentifierValue(CSSValueOutsideShape); 1439 return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
1440 if (shapeValue->type() == ShapeValue::Box) 1440 if (shapeValue->type() == ShapeValue::Box)
1441 return cssValuePool().createValue(shapeValue->layoutBox()); 1441 return cssValuePool().createValue(shapeValue->cssBox());
1442 if (shapeValue->type() == ShapeValue::Image) { 1442 if (shapeValue->type() == ShapeValue::Image) {
1443 if (shapeValue->image()) 1443 if (shapeValue->image())
1444 return shapeValue->image()->cssValue(); 1444 return shapeValue->image()->cssValue();
1445 return cssValuePool().createIdentifierValue(CSSValueNone); 1445 return cssValuePool().createIdentifierValue(CSSValueNone);
1446 } 1446 }
1447 1447
1448 ASSERT(shapeValue->type() == ShapeValue::Shape); 1448 ASSERT(shapeValue->type() == ShapeValue::Shape);
1449 1449
1450 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 1450 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
1451 list->append(valueForBasicShape(style, shapeValue->shape())); 1451 list->append(valueForBasicShape(style, shapeValue->shape()));
1452 if (shapeValue->layoutBox() != BoxMissing) 1452 if (shapeValue->cssBox() != BoxMissing)
1453 list->append(cssValuePool().createValue(shapeValue->layoutBox())); 1453 list->append(cssValuePool().createValue(shapeValue->cssBox()));
1454 return list.release(); 1454 return list.release();
1455 } 1455 }
1456 1456
1457 static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t ouchAction) 1457 static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t ouchAction)
1458 { 1458 {
1459 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 1459 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
1460 if (touchAction == TouchActionAuto) 1460 if (touchAction == TouchActionAuto)
1461 list->append(cssValuePool().createIdentifierValue(CSSValueAuto)); 1461 list->append(cssValuePool().createIdentifierValue(CSSValueAuto));
1462 if (touchAction & TouchActionNone) { 1462 if (touchAction & TouchActionNone) {
1463 ASSERT(touchAction == TouchActionNone); 1463 ASSERT(touchAction == TouchActionNone);
(...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after
3045 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3045 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3046 CSSPropertyB ackgroundClip }; 3046 CSSPropertyB ackgroundClip };
3047 3047
3048 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3048 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3049 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3049 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3050 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3050 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3051 return list.release(); 3051 return list.release();
3052 } 3052 }
3053 3053
3054 } // namespace WebCore 3054 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSBasicShapes.cpp ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698