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

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

Issue 286403004: Add default value for second argument of CSSComputedStyleDeclaration::getPropertyCSSValue() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | no next file » | 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 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 if (!shadowList) 1227 if (!shadowList)
1228 return cssValuePool().createIdentifierValue(CSSValueNone); 1228 return cssValuePool().createIdentifierValue(CSSValueNone);
1229 1229
1230 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ; 1230 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ;
1231 size_t shadowCount = shadowList->shadows().size(); 1231 size_t shadowCount = shadowList->shadows().size();
1232 for (size_t i = 0; i < shadowCount; ++i) 1232 for (size_t i = 0; i < shadowCount; ++i)
1233 list->append(valueForShadowData(shadowList->shadows()[i], style, useSpre ad)); 1233 list->append(valueForShadowData(shadowList->shadows()[i], style, useSpre ad));
1234 return list.release(); 1234 return list.release();
1235 } 1235 }
1236 1236
1237 PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValu e(CSSPropertyID propertyID) const
1238 {
1239 return getPropertyCSSValue(propertyID, UpdateLayout);
1240 }
1241
1242 static CSSValueID identifierForFamily(const AtomicString& family) 1237 static CSSValueID identifierForFamily(const AtomicString& family)
1243 { 1238 {
1244 if (family == FontFamilyNames::webkit_cursive) 1239 if (family == FontFamilyNames::webkit_cursive)
1245 return CSSValueCursive; 1240 return CSSValueCursive;
1246 if (family == FontFamilyNames::webkit_fantasy) 1241 if (family == FontFamilyNames::webkit_fantasy)
1247 return CSSValueFantasy; 1242 return CSSValueFantasy;
1248 if (family == FontFamilyNames::webkit_monospace) 1243 if (family == FontFamilyNames::webkit_monospace)
1249 return CSSValueMonospace; 1244 return CSSValueMonospace;
1250 if (family == FontFamilyNames::webkit_pictograph) 1245 if (family == FontFamilyNames::webkit_pictograph)
1251 return CSSValueWebkitPictograph; 1246 return CSSValueWebkitPictograph;
(...skipping 1803 matching lines...) Expand 10 before | Expand all | Expand 10 after
3055 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3050 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3056 CSSPropertyB ackgroundClip }; 3051 CSSPropertyB ackgroundClip };
3057 3052
3058 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3053 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3059 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3054 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3060 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3055 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3061 return list.release(); 3056 return list.release();
3062 } 3057 }
3063 3058
3064 } // namespace WebCore 3059 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698