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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp

Issue 1715513002: Move background related shorthands into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase test Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 return; 215 return;
216 } 216 }
217 217
218 if (!value.isPrimitiveValue() && !value.isValuePair()) 218 if (!value.isPrimitiveValue() && !value.isValuePair())
219 return; 219 return;
220 220
221 Length length; 221 Length length;
222 if (value.isValuePair()) 222 if (value.isValuePair())
223 length = toCSSPrimitiveValue(toCSSValuePair(value).second()).convertToLe ngth(state.cssToLengthConversionData()); 223 length = toCSSPrimitiveValue(toCSSValuePair(value).second()).convertToLe ngth(state.cssToLengthConversionData());
224 else 224 else
225 length = toCSSPrimitiveValue(value).convertToLength(state.cssToLengthCon versionData()); 225 length = StyleBuilderConverter::convertPositionLength<CSSValueLeft, CSSV alueRight>(state, toCSSPrimitiveValue(value));
226 226
227 layer->setXPosition(length); 227 layer->setXPosition(length);
228 if (value.isValuePair()) 228 if (value.isValuePair())
229 layer->setBackgroundXOrigin(toCSSPrimitiveValue(toCSSValuePair(value).fi rst()).convertTo<BackgroundEdgeOrigin>()); 229 layer->setBackgroundXOrigin(toCSSPrimitiveValue(toCSSValuePair(value).fi rst()).convertTo<BackgroundEdgeOrigin>());
230 } 230 }
231 231
232 void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer , const CSSValue& value) 232 void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer , const CSSValue& value)
233 { 233 {
234 if (value.isInitialValue()) { 234 if (value.isInitialValue()) {
235 layer->setYPosition(FillLayer::initialFillYPosition(layer->type())); 235 layer->setYPosition(FillLayer::initialFillYPosition(layer->type()));
236 return; 236 return;
237 } 237 }
238 238
239 if (!value.isPrimitiveValue() && !value.isValuePair()) 239 if (!value.isPrimitiveValue() && !value.isValuePair())
240 return; 240 return;
241 241
242 Length length; 242 Length length;
243 if (value.isValuePair()) 243 if (value.isValuePair())
244 length = toCSSPrimitiveValue(toCSSValuePair(value).second()).convertToLe ngth(state.cssToLengthConversionData()); 244 length = toCSSPrimitiveValue(toCSSValuePair(value).second()).convertToLe ngth(state.cssToLengthConversionData());
245 else 245 else
246 length = toCSSPrimitiveValue(value).convertToLength(state.cssToLengthCon versionData()); 246 length = StyleBuilderConverter::convertPositionLength<CSSValueTop, CSSVa lueBottom>(state, toCSSPrimitiveValue(value));
247 247
248 layer->setYPosition(length); 248 layer->setYPosition(length);
249 if (value.isValuePair()) 249 if (value.isValuePair())
250 layer->setBackgroundYOrigin(toCSSPrimitiveValue(toCSSValuePair(value).fi rst()).convertTo<BackgroundEdgeOrigin>()); 250 layer->setBackgroundYOrigin(toCSSPrimitiveValue(toCSSValuePair(value).fi rst()).convertTo<BackgroundEdgeOrigin>());
251 } 251 }
252 252
253 void CSSToStyleMap::mapFillMaskSourceType(StyleResolverState&, FillLayer* layer, const CSSValue& value) 253 void CSSToStyleMap::mapFillMaskSourceType(StyleResolverState&, FillLayer* layer, const CSSValue& value)
254 { 254 {
255 EMaskSourceType type = FillLayer::initialFillMaskSourceType(layer->type()); 255 EMaskSourceType type = FillLayer::initialFillMaskSourceType(layer->type());
256 if (value.isInitialValue()) { 256 if (value.isInitialValue()) {
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 verticalRule = SpaceImageRule; 575 verticalRule = SpaceImageRule;
576 break; 576 break;
577 default: // CSSValueRepeat 577 default: // CSSValueRepeat
578 verticalRule = RepeatImageRule; 578 verticalRule = RepeatImageRule;
579 break; 579 break;
580 } 580 }
581 image.setVerticalRule(verticalRule); 581 image.setVerticalRule(verticalRule);
582 } 582 }
583 583
584 } // namespace blink 584 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698