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

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

Issue 16415007: Cleanup usage of CSSPropertyID and CSSValueID inside Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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/CSSFontSelector.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 2823 matching lines...) Expand 10 before | Expand all | Expand 10 after
2834 2834
2835 return getPropertyNameString(computableProperties()[i]); 2835 return getPropertyNameString(computableProperties()[i]);
2836 } 2836 }
2837 2837
2838 bool CSSComputedStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, c onst CSSValue* propertyValue) const 2838 bool CSSComputedStyleDeclaration::cssPropertyMatches(CSSPropertyID propertyID, c onst CSSValue* propertyValue) const
2839 { 2839 {
2840 if (propertyID == CSSPropertyFontSize && propertyValue->isPrimitiveValue() & & m_node) { 2840 if (propertyID == CSSPropertyFontSize && propertyValue->isPrimitiveValue() & & m_node) {
2841 m_node->document()->updateLayoutIgnorePendingStylesheets(); 2841 m_node->document()->updateLayoutIgnorePendingStylesheets();
2842 RenderStyle* style = m_node->computedStyle(m_pseudoElementSpecifier); 2842 RenderStyle* style = m_node->computedStyle(m_pseudoElementSpecifier);
2843 if (style && style->fontDescription().keywordSize()) { 2843 if (style && style->fontDescription().keywordSize()) {
2844 int sizeValue = cssIdentifierForFontSizeKeyword(style->fontDescripti on().keywordSize()); 2844 CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->fontDe scription().keywordSize());
2845 const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(proper tyValue); 2845 const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(proper tyValue);
2846 if (primitiveValue->isIdent() && primitiveValue->getIdent() == sizeV alue) 2846 if (primitiveValue->isValueID() && primitiveValue->getValueID() == s izeValue)
2847 return true; 2847 return true;
2848 } 2848 }
2849 } 2849 }
2850 RefPtr<CSSValue> value = getPropertyCSSValue(propertyID); 2850 RefPtr<CSSValue> value = getPropertyCSSValue(propertyID);
2851 return value && propertyValue && value->equals(*propertyValue); 2851 return value && propertyValue && value->equals(*propertyValue);
2852 } 2852 }
2853 2853
2854 PassRefPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties( ) const 2854 PassRefPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties( ) const
2855 { 2855 {
2856 return copyPropertiesInSet(computableProperties()); 2856 return copyPropertiesInSet(computableProperties());
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
2994 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 2994 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
2995 CSSPropertyB ackgroundClip }; 2995 CSSPropertyB ackgroundClip };
2996 2996
2997 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 2997 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
2998 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 2998 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
2999 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 2999 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
3000 return list.release(); 3000 return list.release();
3001 } 3001 }
3002 3002
3003 } // namespace WebCore 3003 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698