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

Unified Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 811843003: replace COMPILE_ASSERT with static_assert in core/rendering/ (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/style/FillLayer.cpp ('k') | Source/core/rendering/style/StyleBoxData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/RenderStyle.cpp
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
index 45539d8cb177cb1e13f3661b1b8a4ba69e7fc7e8..a59ae27816bb3bd8e11017af5d867cb98e8d052f 100644
--- a/Source/core/rendering/style/RenderStyle.cpp
+++ b/Source/core/rendering/style/RenderStyle.cpp
@@ -50,7 +50,7 @@ struct SameSizeAsBorderValue {
unsigned m_width;
};
-COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+static_assert(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), "BorderValue should stay small");
struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> {
void* dataRefs[7];
@@ -66,7 +66,7 @@ struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> {
} noninherited_flags;
};
-COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small);
+static_assert(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
inline RenderStyle* defaultStyle()
{
@@ -109,8 +109,8 @@ ALWAYS_INLINE RenderStyle::RenderStyle()
, m_svgStyle(defaultStyle()->m_svgStyle)
{
setBitDefaults(); // Would it be faster to copy this from the default style?
- COMPILE_ASSERT((sizeof(InheritedFlags) <= 8), InheritedFlags_does_not_grow);
- COMPILE_ASSERT((sizeof(NonInheritedFlags) <= 8), NonInheritedFlags_does_not_grow);
+ static_assert((sizeof(InheritedFlags) <= 8), "InheritedFlags should not grow");
+ static_assert((sizeof(NonInheritedFlags) <= 8), "NonInheritedFlags should not grow");
}
ALWAYS_INLINE RenderStyle::RenderStyle(DefaultStyleTag)
« no previous file with comments | « Source/core/rendering/style/FillLayer.cpp ('k') | Source/core/rendering/style/StyleBoxData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698