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

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

Issue 1192983003: CSS Custom Properties (Variables) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ToT-ed again... Created 5 years, 5 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 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 2684 matching lines...) Expand 10 before | Expand all | Expand 10 after
2695 return cssValuePool().createValue(1, CSSPrimitiveValue::CSS_NUMBER); 2695 return cssValuePool().createValue(1, CSSPrimitiveValue::CSS_NUMBER);
2696 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 2696 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2697 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::CSS_NUMBER)); 2697 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::CSS_NUMBER));
2698 if (style.scale()->y() == 1 && style.scale()->z() == 1) 2698 if (style.scale()->y() == 1 && style.scale()->z() == 1)
2699 return list.release(); 2699 return list.release();
2700 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::CSS_NUMBER)); 2700 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::CSS_NUMBER));
2701 if (style.scale()->z() != 1) 2701 if (style.scale()->z() != 1)
2702 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::CSS_NUMBER)); 2702 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::CSS_NUMBER));
2703 return list.release(); 2703 return list.release();
2704 } 2704 }
2705 case CSSPropertyVariable:
2706 ASSERT_NOT_REACHED();
2707 return nullptr;
2705 case CSSPropertyAll: 2708 case CSSPropertyAll:
2706 return nullptr; 2709 return nullptr;
2707 default: 2710 default:
2708 break; 2711 break;
2709 } 2712 }
2710 ASSERT_NOT_REACHED(); 2713 ASSERT_NOT_REACHED();
2711 return nullptr; 2714 return nullptr;
2712 } 2715 }
2713 2716
2714 } 2717 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698