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

Side by Side Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 25434004: Generate toCSSFooValue() for CSSCanvasValue, CSSCrossfadeValue, CSSImageGeneratorValue, CSSImageVal… (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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 if (!value->isValueList()) 1323 if (!value->isValueList())
1324 return; 1324 return;
1325 1325
1326 bool didSet = false; 1326 bool didSet = false;
1327 for (CSSValueListIterator i = value; i.hasMore(); i.advance()) { 1327 for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
1328 CSSValue* item = i.value(); 1328 CSSValue* item = i.value();
1329 if (item->isImageGeneratorValue()) { 1329 if (item->isImageGeneratorValue()) {
1330 if (item->isGradientValue()) 1330 if (item->isGradientValue())
1331 state.style()->setContent(StyleGeneratedImage::create(to CSSGradientValue(item)->gradientWithStylesResolved(state.document().textLinkColo rs(), state.style()->color()).get()), didSet); 1331 state.style()->setContent(StyleGeneratedImage::create(to CSSGradientValue(item)->gradientWithStylesResolved(state.document().textLinkColo rs(), state.style()->color()).get()), didSet);
1332 else 1332 else
1333 state.style()->setContent(StyleGeneratedImage::create(st atic_cast<CSSImageGeneratorValue*>(item)), didSet); 1333 state.style()->setContent(StyleGeneratedImage::create(to CSSImageGeneratorValue(item)), didSet);
1334 didSet = true; 1334 didSet = true;
1335 } else if (item->isImageSetValue()) { 1335 } else if (item->isImageSetValue()) {
1336 state.style()->setContent(state.elementStyleResources().setO rPendingFromValue(CSSPropertyContent, toCSSImageSetValue(item)), didSet); 1336 state.style()->setContent(state.elementStyleResources().setO rPendingFromValue(CSSPropertyContent, toCSSImageSetValue(item)), didSet);
1337 didSet = true; 1337 didSet = true;
1338 } 1338 }
1339 1339
1340 if (item->isImageValue()) { 1340 if (item->isImageValue()) {
1341 state.style()->setContent(state.elementStyleResources().cach edOrPendingFromValue(CSSPropertyContent, toCSSImageValue(item)), didSet); 1341 state.style()->setContent(state.elementStyleResources().cach edOrPendingFromValue(CSSPropertyContent, toCSSImageValue(item)), didSet);
1342 didSet = true; 1342 didSet = true;
1343 continue; 1343 continue;
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1723 case CSSPropertyWebkitLineBoxContain: { 1723 case CSSPropertyWebkitLineBoxContain: {
1724 HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain) 1724 HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain)
1725 if (primitiveValue && primitiveValue->getValueID() == CSSValueNone) { 1725 if (primitiveValue && primitiveValue->getValueID() == CSSValueNone) {
1726 state.style()->setLineBoxContain(LineBoxContainNone); 1726 state.style()->setLineBoxContain(LineBoxContainNone);
1727 return; 1727 return;
1728 } 1728 }
1729 1729
1730 if (!value->isLineBoxContainValue()) 1730 if (!value->isLineBoxContainValue())
1731 return; 1731 return;
1732 1732
1733 CSSLineBoxContainValue* lineBoxContainValue = static_cast<CSSLineBoxCont ainValue*>(value); 1733 state.style()->setLineBoxContain(toCSSLineBoxContainValue(value)->value( ));
1734 state.style()->setLineBoxContain(lineBoxContainValue->value());
1735 return; 1734 return;
1736 } 1735 }
1737 1736
1738 // CSS Fonts Module Level 3 1737 // CSS Fonts Module Level 3
1739 case CSSPropertyWebkitFontFeatureSettings: { 1738 case CSSPropertyWebkitFontFeatureSettings: {
1740 if (primitiveValue && primitiveValue->getValueID() == CSSValueNormal) { 1739 if (primitiveValue && primitiveValue->getValueID() == CSSValueNormal) {
1741 state.fontBuilder().setFeatureSettingsNormal(); 1740 state.fontBuilder().setFeatureSettingsNormal();
1742 return; 1741 return;
1743 } 1742 }
1744 1743
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
2406 break; 2405 break;
2407 } 2406 }
2408 case CSSPropertyEnableBackground: 2407 case CSSPropertyEnableBackground:
2409 // Silently ignoring this property for now 2408 // Silently ignoring this property for now
2410 // http://bugs.webkit.org/show_bug.cgi?id=6022 2409 // http://bugs.webkit.org/show_bug.cgi?id=6022
2411 break; 2410 break;
2412 } 2411 }
2413 } 2412 }
2414 2413
2415 } // namespace WebCore 2414 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/ElementStyleResources.cpp ('k') | Source/core/rendering/style/StylePendingImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698