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

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: Use m_unit Created 5 years, 1 month 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 2665 matching lines...) Expand 10 before | Expand all | Expand 10 after
2676 return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Nu mber); 2676 return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Nu mber);
2677 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed(); 2677 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparat ed();
2678 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::UnitType::Number)); 2678 list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitive Value::UnitType::Number));
2679 if (style.scale()->y() == 1 && style.scale()->z() == 1) 2679 if (style.scale()->y() == 1 && style.scale()->z() == 1)
2680 return list.release(); 2680 return list.release();
2681 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::UnitType::Number)); 2681 list->append(cssValuePool().createValue(style.scale()->y(), CSSPrimitive Value::UnitType::Number));
2682 if (style.scale()->z() != 1) 2682 if (style.scale()->z() != 1)
2683 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::UnitType::Number)); 2683 list->append(cssValuePool().createValue(style.scale()->z(), CSSPrimi tiveValue::UnitType::Number));
2684 return list.release(); 2684 return list.release();
2685 } 2685 }
2686 case CSSPropertyVariable:
2687 // TODO(leviw): We should have a way to retrive variables here.
2688 ASSERT_NOT_REACHED();
2689 return nullptr;
2686 case CSSPropertyAll: 2690 case CSSPropertyAll:
2687 return nullptr; 2691 return nullptr;
2688 default: 2692 default:
2689 break; 2693 break;
2690 } 2694 }
2691 ASSERT_NOT_REACHED(); 2695 ASSERT_NOT_REACHED();
2692 return nullptr; 2696 return nullptr;
2693 } 2697 }
2694 2698
2695 } 2699 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698