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

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

Issue 216803002: Implement all shorthand property. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed parseAnimationProperty 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 | 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 2841 matching lines...) Expand 10 before | Expand all | Expand 10 after
2852 case CSSPropertyBaselineShift: 2852 case CSSPropertyBaselineShift:
2853 case CSSPropertyDominantBaseline: 2853 case CSSPropertyDominantBaseline:
2854 case CSSPropertyGlyphOrientationHorizontal: 2854 case CSSPropertyGlyphOrientationHorizontal:
2855 case CSSPropertyGlyphOrientationVertical: 2855 case CSSPropertyGlyphOrientationVertical:
2856 case CSSPropertyKerning: 2856 case CSSPropertyKerning:
2857 case CSSPropertyTextAnchor: 2857 case CSSPropertyTextAnchor:
2858 case CSSPropertyVectorEffect: 2858 case CSSPropertyVectorEffect:
2859 case CSSPropertyPaintOrder: 2859 case CSSPropertyPaintOrder:
2860 case CSSPropertyWritingMode: 2860 case CSSPropertyWritingMode:
2861 return getSVGPropertyCSSValue(propertyID, DoNotUpdateLayout); 2861 return getSVGPropertyCSSValue(propertyID, DoNotUpdateLayout);
2862
2863 case CSSPropertyAll:
2864 {
2865 // FIXME: need to support "unset".
2866 bool isInitial = true;
2867 bool isInherit = true;
2868 for (unsigned i = 0; i < allShorthand().length() && (isInitial || is Inherit); ++i) {
2869 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(allShor thand().properties()[i], DoNotUpdateLayout);
2870 isInitial = isInitial && value->isInitialValue();
2871 isInherit = isInherit && value->isInheritedValue();
esprehn 2014/05/02 22:24:11 What is this doing? This loop doesn't make sense t
tasak 2014/05/12 14:33:27 I would like to see if all longhands have initial
2872 }
2873 if (isInitial)
2874 return cssValuePool().createExplicitInitialValue();
2875 if (isInherit)
2876 return cssValuePool().createInheritedValue();
2877 return nullptr;
2878 }
2862 } 2879 }
2863 2880
2864 logUnimplementedPropertyID(propertyID); 2881 logUnimplementedPropertyID(propertyID);
2865 return nullptr; 2882 return nullptr;
2866 } 2883 }
2867 2884
2868 String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) c onst 2885 String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) c onst
2869 { 2886 {
2870 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID); 2887 RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
2871 if (value) 2888 if (value)
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
3048 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3065 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3049 CSSPropertyB ackgroundClip }; 3066 CSSPropertyB ackgroundClip };
3050 3067
3051 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ; 3068 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated() ;
3052 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3069 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3053 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3070 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3054 return list.release(); 3071 return list.release();
3055 } 3072 }
3056 3073
3057 } // namespace WebCore 3074 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698