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

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

Issue 184293008: Oilpan: fix build after changes that did not take oilpan into account. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/css/parser/CSSPropertyParser.cpp » ('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 } 1431 }
1432 1432
1433 static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue) 1433 static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue)
1434 { 1434 {
1435 if (!shapeValue) 1435 if (!shapeValue)
1436 return cssValuePool().createIdentifierValue(CSSValueNone); 1436 return cssValuePool().createIdentifierValue(CSSValueNone);
1437 if (shapeValue->type() == ShapeValue::Outside) 1437 if (shapeValue->type() == ShapeValue::Outside)
1438 return cssValuePool().createIdentifierValue(CSSValueOutsideShape); 1438 return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
1439 if (shapeValue->type() == ShapeValue::Box) 1439 if (shapeValue->type() == ShapeValue::Box)
1440 return cssValuePool().createValue(shapeValue->layoutBox()); 1440 return cssValuePool().createValue(shapeValue->layoutBox());
1441 if (shapeValue->type() == ShapeValue::Image) 1441 if (shapeValue->type() == ShapeValue::Image) {
1442 return shapeValue->image() ? shapeValue->image()->cssValue() : cssValueP ool().createIdentifierValue(CSSValueNone); 1442 if (shapeValue->image())
1443 return shapeValue->image()->cssValue();
1444 return cssValuePool().createIdentifierValue(CSSValueNone);
1445 }
1443 1446
1444 ASSERT(shapeValue->type() == ShapeValue::Shape); 1447 ASSERT(shapeValue->type() == ShapeValue::Shape);
1445 1448
1446 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); 1449 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
1447 list->append(valueForBasicShape(style, shapeValue->shape())); 1450 list->append(valueForBasicShape(style, shapeValue->shape()));
1448 if (shapeValue->layoutBox() != BoxMissing) 1451 if (shapeValue->layoutBox() != BoxMissing)
1449 list->append(cssValuePool().createValue(shapeValue->layoutBox())); 1452 list->append(cssValuePool().createValue(shapeValue->layoutBox()));
1450 return list.release(); 1453 return list.release();
1451 } 1454 }
1452 1455
1453 static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t ouchAction) 1456 static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t ouchAction)
1454 { 1457 {
1455 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 1458 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
1456 if (touchAction == TouchActionAuto) 1459 if (touchAction == TouchActionAuto)
(...skipping 1575 matching lines...) Expand 10 before | Expand all | Expand 10 after
3032 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3035 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3033 CSSPropertyB ackgroundClip }; 3036 CSSPropertyB ackgroundClip };
3034 3037
3035 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3038 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3036 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3039 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3037 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3040 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3038 return list.release(); 3041 return list.release();
3039 } 3042 }
3040 3043
3041 } // namespace WebCore 3044 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698