OLD | NEW |
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 Apple Computer, Inc. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 bool inherited) | 43 bool inherited) |
44 : m_propertyID(propertyID), | 44 : m_propertyID(propertyID), |
45 m_isSetFromShorthand(isSetFromShorthand), | 45 m_isSetFromShorthand(isSetFromShorthand), |
46 m_indexInShorthandsVector(indexInShorthandsVector), | 46 m_indexInShorthandsVector(indexInShorthandsVector), |
47 m_important(important), | 47 m_important(important), |
48 m_implicit(implicit), | 48 m_implicit(implicit), |
49 m_inherited(inherited) {} | 49 m_inherited(inherited) {} |
50 | 50 |
51 CSSPropertyID shorthandID() const; | 51 CSSPropertyID shorthandID() const; |
52 | 52 |
53 uint16_t m_propertyID : 10; | 53 unsigned m_propertyID : 10; |
54 uint16_t m_isSetFromShorthand : 1; | 54 unsigned m_isSetFromShorthand : 1; |
55 uint16_t | 55 // If this property was set as part of an ambiguous shorthand, gives the index |
56 m_indexInShorthandsVector : 2; // If this property was set as part of an
ambiguous shorthand, gives the index in the shorthands vector. | 56 // in the shorthands vector. |
57 uint16_t m_important : 1; | 57 unsigned m_indexInShorthandsVector : 2; |
58 uint16_t | 58 unsigned m_important : 1; |
59 m_implicit : 1; // Whether or not the property was set implicitly as the
result of a shorthand. | 59 // Whether or not the property was set implicitly as the result of a |
60 uint16_t m_inherited : 1; | 60 // shorthand. |
| 61 unsigned m_implicit : 1; |
| 62 unsigned m_inherited : 1; |
61 }; | 63 }; |
62 | 64 |
63 class CSSProperty { | 65 class CSSProperty { |
64 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); | 66 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); |
65 | 67 |
66 public: | 68 public: |
67 CSSProperty(CSSPropertyID propertyID, | 69 CSSProperty(CSSPropertyID propertyID, |
68 const CSSValue& value, | 70 const CSSValue& value, |
69 bool important = false, | 71 bool important = false, |
70 bool isSetFromShorthand = false, | 72 bool isSetFromShorthand = false, |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 private: | 107 private: |
106 StylePropertyMetadata m_metadata; | 108 StylePropertyMetadata m_metadata; |
107 Member<const CSSValue> m_value; | 109 Member<const CSSValue> m_value; |
108 }; | 110 }; |
109 | 111 |
110 } // namespace blink | 112 } // namespace blink |
111 | 113 |
112 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty); | 114 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty); |
113 | 115 |
114 #endif // CSSProperty_h | 116 #endif // CSSProperty_h |
OLD | NEW |