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

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

Issue 26234003: Add *CSS* prefix to ShadowValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/CSSParser-in.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 27 matching lines...) Expand all
38 #include "core/css/CSSFontValue.h" 38 #include "core/css/CSSFontValue.h"
39 #include "core/css/CSSFunctionValue.h" 39 #include "core/css/CSSFunctionValue.h"
40 #include "core/css/CSSGridTemplateValue.h" 40 #include "core/css/CSSGridTemplateValue.h"
41 #include "core/css/CSSLineBoxContainValue.h" 41 #include "core/css/CSSLineBoxContainValue.h"
42 #include "core/css/CSSMixFunctionValue.h" 42 #include "core/css/CSSMixFunctionValue.h"
43 #include "core/css/CSSParser.h" 43 #include "core/css/CSSParser.h"
44 #include "core/css/CSSPrimitiveValue.h" 44 #include "core/css/CSSPrimitiveValue.h"
45 #include "core/css/CSSPrimitiveValueMappings.h" 45 #include "core/css/CSSPrimitiveValueMappings.h"
46 #include "core/css/CSSReflectValue.h" 46 #include "core/css/CSSReflectValue.h"
47 #include "core/css/CSSSelector.h" 47 #include "core/css/CSSSelector.h"
48 #include "core/css/CSSShadowValue.h"
48 #include "core/css/CSSTimingFunctionValue.h" 49 #include "core/css/CSSTimingFunctionValue.h"
49 #include "core/css/CSSTransformValue.h" 50 #include "core/css/CSSTransformValue.h"
50 #include "core/css/CSSValueList.h" 51 #include "core/css/CSSValueList.h"
51 #include "core/css/CSSValuePool.h" 52 #include "core/css/CSSValuePool.h"
52 #include "core/css/Pair.h" 53 #include "core/css/Pair.h"
53 #include "core/css/Rect.h" 54 #include "core/css/Rect.h"
54 #include "core/css/ShadowValue.h"
55 #include "core/css/StylePropertySet.h" 55 #include "core/css/StylePropertySet.h"
56 #include "core/css/resolver/StyleResolver.h" 56 #include "core/css/resolver/StyleResolver.h"
57 #include "core/dom/Document.h" 57 #include "core/dom/Document.h"
58 #include "core/dom/ExceptionCode.h" 58 #include "core/dom/ExceptionCode.h"
59 #include "core/dom/PseudoElement.h" 59 #include "core/dom/PseudoElement.h"
60 #include "core/page/RuntimeCSSEnabled.h" 60 #include "core/page/RuntimeCSSEnabled.h"
61 #include "core/page/animation/AnimationController.h" 61 #include "core/page/animation/AnimationController.h"
62 #include "core/platform/graphics/FontFeatureSettings.h" 62 #include "core/platform/graphics/FontFeatureSettings.h"
63 #include "core/rendering/RenderBox.h" 63 #include "core/rendering/RenderBox.h"
64 #include "core/rendering/RenderView.h" 64 #include "core/rendering/RenderView.h"
(...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 return cssValuePool().createIdentifierValue(CSSValueNone); 1318 return cssValuePool().createIdentifierValue(CSSValueNone);
1319 1319
1320 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); 1320 RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
1321 for (const ShadowData* s = shadow; s; s = s->next()) { 1321 for (const ShadowData* s = shadow; s; s = s->next()) {
1322 RefPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(s->x(), style); 1322 RefPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(s->x(), style);
1323 RefPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(s->y(), style); 1323 RefPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(s->y(), style);
1324 RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(s->blur(), style ); 1324 RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(s->blur(), style );
1325 RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? PassRefPtr<CSSPrimitiveValue>() : zoomAdjustedPixelValue(s->spread(), style); 1325 RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? PassRefPtr<CSSPrimitiveValue>() : zoomAdjustedPixelValue(s->spread(), style);
1326 RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style() == Normal ? PassRefPtr<CSSPrimitiveValue>() : cssValuePool().createI dentifierValue(CSSValueInset); 1326 RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style() == Normal ? PassRefPtr<CSSPrimitiveValue>() : cssValuePool().createI dentifierValue(CSSValueInset);
1327 RefPtr<CSSPrimitiveValue> color = cssValuePool().createColorValue(s->col or().rgb()); 1327 RefPtr<CSSPrimitiveValue> color = cssValuePool().createColorValue(s->col or().rgb());
1328 list->prepend(ShadowValue::create(x.release(), y.release(), blur.release (), spread.release(), style.release(), color.release())); 1328 list->prepend(CSSShadowValue::create(x.release(), y.release(), blur.rele ase(), spread.release(), style.release(), color.release()));
1329 } 1329 }
1330 return list.release(); 1330 return list.release();
1331 } 1331 }
1332 1332
1333 PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert yID propertyID) const 1333 PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert yID propertyID) const
1334 { 1334 {
1335 return getPropertyCSSValue(propertyID, UpdateLayout); 1335 return getPropertyCSSValue(propertyID, UpdateLayout);
1336 } 1336 }
1337 1337
1338 static CSSValueID identifierForFamily(const AtomicString& family) 1338 static CSSValueID identifierForFamily(const AtomicString& family)
(...skipping 1894 matching lines...) Expand 10 before | Expand all | Expand 10 after
3233 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3233 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3234 CSSPropertyB ackgroundClip }; 3234 CSSPropertyB ackgroundClip };
3235 3235
3236 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3236 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3237 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator)))); 3237 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlash Seperator))));
3238 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator)))); 3238 list->append(valuesForShorthandProperty(StylePropertyShorthand(CSSPropertyBa ckground, propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSe perator))));
3239 return list.release(); 3239 return list.release();
3240 } 3240 }
3241 3241
3242 } // namespace WebCore 3242 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/css/CSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698