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

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

Issue 204373003: Oilpan: Change references to MutableStylePropertySet to transition types. (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
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 2887 matching lines...) Expand 10 before | Expand all | Expand 10 after
2898 CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->fontDe scription().keywordSize()); 2898 CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->fontDe scription().keywordSize());
2899 const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(proper tyValue); 2899 const CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(proper tyValue);
2900 if (primitiveValue->isValueID() && primitiveValue->getValueID() == s izeValue) 2900 if (primitiveValue->isValueID() && primitiveValue->getValueID() == s izeValue)
2901 return true; 2901 return true;
2902 } 2902 }
2903 } 2903 }
2904 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID); 2904 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
2905 return value && propertyValue && value->equals(*propertyValue); 2905 return value && propertyValue && value->equals(*propertyValue);
2906 } 2906 }
2907 2907
2908 PassRefPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties( ) const 2908 PassRefPtrWillBeRawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::cop yProperties() const
2909 { 2909 {
2910 return copyPropertiesInSet(computableProperties()); 2910 return copyPropertiesInSet(computableProperties());
2911 } 2911 }
2912 2912
2913 PassRefPtrWillBeRawPtr<CSSValueList> CSSComputedStyleDeclaration::valuesForShort handProperty(const StylePropertyShorthand& shorthand) const 2913 PassRefPtrWillBeRawPtr<CSSValueList> CSSComputedStyleDeclaration::valuesForShort handProperty(const StylePropertyShorthand& shorthand) const
2914 { 2914 {
2915 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 2915 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
2916 for (size_t i = 0; i < shorthand.length(); ++i) { 2916 for (size_t i = 0; i < shorthand.length(); ++i) {
2917 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(shorthand.prope rties()[i], DoNotUpdateLayout); 2917 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(shorthand.prope rties()[i], DoNotUpdateLayout);
2918 list->append(value); 2918 list->append(value);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
2951 PassRefPtrWillBeRawPtr<CSSValueList> CSSComputedStyleDeclaration::valuesForGridS horthand(const StylePropertyShorthand& shorthand) const 2951 PassRefPtrWillBeRawPtr<CSSValueList> CSSComputedStyleDeclaration::valuesForGridS horthand(const StylePropertyShorthand& shorthand) const
2952 { 2952 {
2953 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 2953 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
2954 for (size_t i = 0; i < shorthand.length(); ++i) { 2954 for (size_t i = 0; i < shorthand.length(); ++i) {
2955 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(shorthand.prope rties()[i], DoNotUpdateLayout); 2955 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(shorthand.prope rties()[i], DoNotUpdateLayout);
2956 list->append(value.release()); 2956 list->append(value.release());
2957 } 2957 }
2958 return list.release(); 2958 return list.release();
2959 } 2959 }
2960 2960
2961 PassRefPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyPropertiesI nSet(const Vector<CSSPropertyID>& properties) const 2961 PassRefPtrWillBeRawPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::cop yPropertiesInSet(const Vector<CSSPropertyID>& properties) const
2962 { 2962 {
2963 WillBeHeapVector<CSSProperty, 256> list; 2963 WillBeHeapVector<CSSProperty, 256> list;
2964 list.reserveInitialCapacity(properties.size()); 2964 list.reserveInitialCapacity(properties.size());
2965 for (unsigned i = 0; i < properties.size(); ++i) { 2965 for (unsigned i = 0; i < properties.size(); ++i) {
2966 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(properties[i]); 2966 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(properties[i]);
2967 if (value) 2967 if (value)
2968 list.append(CSSProperty(properties[i], value.release(), false)); 2968 list.append(CSSProperty(properties[i], value.release(), false));
2969 } 2969 }
2970 return MutableStylePropertySet::create(list.data(), list.size()); 2970 return MutableStylePropertySet::create(list.data(), list.size());
2971 } 2971 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3042 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3043 CSSPropertyB ackgroundClip }; 3043 CSSPropertyB ackgroundClip };
3044 3044
3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3045 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3046 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3047 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3048 return list.release(); 3048 return list.release();
3049 } 3049 }
3050 3050
3051 } // namespace WebCore 3051 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698