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

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

Issue 1192983003: CSS Custom Properties (Variables) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Whoops, the forward declaration just needed to be moved. Created 5 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 | 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 2682 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Nu mber); 2693 return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Nu mber);
2694 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 2694 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2695 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::UnitType::Number)); 2695 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::UnitType::Number));
2696 if (style.scale()->y() == 1 && style.scale()->z() == 1) 2696 if (style.scale()->y() == 1 && style.scale()->z() == 1)
2697 return list.release(); 2697 return list.release();
2698 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::UnitType::Number)); 2698 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::UnitType::Number));
2699 if (style.scale()->z() != 1) 2699 if (style.scale()->z() != 1)
2700 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::UnitType::Number)); 2700 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::UnitType::Number));
2701 return list.release(); 2701 return list.release();
2702 } 2702 }
2703 case CSSPropertyVariable:
2704 ASSERT_NOT_REACHED();
2705 return nullptr;
2703 case CSSPropertyAll: 2706 case CSSPropertyAll:
2704 return nullptr; 2707 return nullptr;
2705 default: 2708 default:
2706 break; 2709 break;
2707 } 2710 }
2708 ASSERT_NOT_REACHED(); 2711 ASSERT_NOT_REACHED();
2709 return nullptr; 2712 return nullptr;
2710 } 2713 }
2711 2714
2712 } 2715 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698