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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSParserValues.h

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values
Patch Set: Rebase 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 Operator = 0x100000, 56 Operator = 0x100000,
57 Function = 0x100001, 57 Function = 0x100001,
58 CalcFunction = 0x100002, 58 CalcFunction = 0x100002,
59 ValueList = 0x100003, 59 ValueList = 0x100003,
60 HexColor = 0x100004, 60 HexColor = 0x100004,
61 Identifier = 0x100005, 61 Identifier = 0x100005,
62 // Represents a dimension by a list of two values, a UnitType::Number an d an Identifier 62 // Represents a dimension by a list of two values, a UnitType::Number an d an Identifier
63 DimensionList = 0x100006, 63 DimensionList = 0x100006,
64 // Represents a unicode range by a pair of UChar32 values 64 // Represents a unicode range by a pair of UChar32 values
65 UnicodeRange = 0x100007, 65 UnicodeRange = 0x100007,
66 String = 0x100008,
67 URI = 0x100009,
66 }; 68 };
67 int m_unit; 69 int m_unit;
68 CSSPrimitiveValue::UnitType unit() const { return static_cast<CSSPrimitiveVa lue::UnitType>(m_unit); } 70 CSSPrimitiveValue::UnitType unit() const { return static_cast<CSSPrimitiveVa lue::UnitType>(m_unit); }
69 void setUnit(CSSPrimitiveValue::UnitType unit) { m_unit = static_cast<int>(u nit); } 71 void setUnit(CSSPrimitiveValue::UnitType unit) { m_unit = static_cast<int>(u nit); }
70 72
71 inline void setFromNumber(double value, CSSPrimitiveValue::UnitType); 73 inline void setFromNumber(double value, CSSPrimitiveValue::UnitType);
72 inline void setFromOperator(UChar); 74 inline void setFromOperator(UChar);
73 inline void setFromValueList(PassOwnPtr<CSSParserValueList>); 75 inline void setFromValueList(PassOwnPtr<CSSParserValueList>);
74 }; 76 };
75 77
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 { 149 {
148 id = CSSValueInvalid; 150 id = CSSValueInvalid;
149 this->valueList = valueList.leakPtr(); 151 this->valueList = valueList.leakPtr();
150 m_unit = ValueList; 152 m_unit = ValueList;
151 isInt = false; 153 isInt = false;
152 } 154 }
153 155
154 } 156 }
155 157
156 #endif 158 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/RuleFeature.cpp ('k') | third_party/WebKit/Source/core/css/parser/CSSParserValues.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698