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/CSSPrimitiveValue.cpp

Issue 16183002: Unprefix CSS Variables (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased and updated prefix test Created 7 years, 6 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
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/StylePropertySet.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 case CSS_VH: 1059 case CSS_VH:
1060 text = formatNumber(m_value.num, "vh"); 1060 text = formatNumber(m_value.num, "vh");
1061 break; 1061 break;
1062 case CSS_VMIN: 1062 case CSS_VMIN:
1063 text = formatNumber(m_value.num, "vmin"); 1063 text = formatNumber(m_value.num, "vmin");
1064 break; 1064 break;
1065 case CSS_VMAX: 1065 case CSS_VMAX:
1066 text = formatNumber(m_value.num, "vmax"); 1066 text = formatNumber(m_value.num, "vmax");
1067 break; 1067 break;
1068 case CSS_VARIABLE_NAME: 1068 case CSS_VARIABLE_NAME:
1069 text = "-webkit-var(" + String(m_value.string) + ")"; 1069 text = "var(" + String(m_value.string) + ")";
1070 break; 1070 break;
1071 } 1071 }
1072 1072
1073 ASSERT(!cssTextCache().contains(this)); 1073 ASSERT(!cssTextCache().contains(this));
1074 cssTextCache().set(this, text); 1074 cssTextCache().set(this, text);
1075 m_hasCachedCSSText = true; 1075 m_hasCachedCSSText = true;
1076 return text; 1076 return text;
1077 } 1077 }
1078 1078
1079 String CSSPrimitiveValue::customSerializeResolvingVariables(const HashMap<Atomic String, String>& variables) const 1079 String CSSPrimitiveValue::customSerializeResolvingVariables(const HashMap<Atomic String, String>& variables) const
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 break; 1322 break;
1323 case CSS_CALC: 1323 case CSS_CALC:
1324 info.addMember(m_value.calc, "value.calc"); 1324 info.addMember(m_value.calc, "value.calc");
1325 break; 1325 break;
1326 default: 1326 default:
1327 break; 1327 break;
1328 } 1328 }
1329 } 1329 }
1330 1330
1331 } // namespace WebCore 1331 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/StylePropertySet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698