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

Side by Side Diff: Source/core/css/CSSProperty.cpp

Issue 809823002: replace COMPILE_ASSERT with static assert in core/css/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « Source/core/css/CSSBasicShapes.cpp ('k') | Source/core/css/CSSRule.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 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 14 matching lines...) Expand all
25 #include "core/css/CSSValueList.h" 25 #include "core/css/CSSValueList.h"
26 #include "core/rendering/style/RenderStyleConstants.h" 26 #include "core/rendering/style/RenderStyleConstants.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 struct SameSizeAsCSSProperty { 30 struct SameSizeAsCSSProperty {
31 uint32_t bitfields; 31 uint32_t bitfields;
32 void* value; 32 void* value;
33 }; 33 };
34 34
35 COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty _should_stay_small); 35 static_assert(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), "CSSProperty should stay small");
36 36
37 CSSPropertyID StylePropertyMetadata::shorthandID() const 37 CSSPropertyID StylePropertyMetadata::shorthandID() const
38 { 38 {
39 if (!m_isSetFromShorthand) 39 if (!m_isSetFromShorthand)
40 return CSSPropertyInvalid; 40 return CSSPropertyInvalid;
41 41
42 Vector<StylePropertyShorthand, 4> shorthands; 42 Vector<StylePropertyShorthand, 4> shorthands;
43 getMatchingShorthandsForLonghand(static_cast<CSSPropertyID>(m_propertyID), & shorthands); 43 getMatchingShorthandsForLonghand(static_cast<CSSPropertyID>(m_propertyID), & shorthands);
44 ASSERT(shorthands.size() && m_indexInShorthandsVector >= 0 && m_indexInShort handsVector < shorthands.size()); 44 ASSERT(shorthands.size() && m_indexInShorthandsVector >= 0 && m_indexInShort handsVector < shorthands.size());
45 return shorthands.at(m_indexInShorthandsVector).id(); 45 return shorthands.at(m_indexInShorthandsVector).id();
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 // all shorthand spec says: 264 // all shorthand spec says:
265 // The all property is a shorthand that resets all CSS properties except 265 // The all property is a shorthand that resets all CSS properties except
266 // direction and unicode-bidi. It only accepts the CSS-wide keywords. 266 // direction and unicode-bidi. It only accepts the CSS-wide keywords.
267 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand 267 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
268 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not 268 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not
269 // affected by all property. 269 // affected by all property.
270 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire ction; 270 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire ction;
271 } 271 }
272 272
273 } // namespace blink 273 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSBasicShapes.cpp ('k') | Source/core/css/CSSRule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698