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

Side by Side Diff: Source/core/rendering/style/StyleBoxData.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
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/rendering/style/RenderStyle.h" 25 #include "core/rendering/style/RenderStyle.h"
26 26
27 namespace blink { 27 namespace blink {
28 28
29 struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> { 29 struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> {
30 Length length[7]; 30 Length length[7];
31 int m_zIndex; 31 int m_zIndex;
32 uint32_t bitfields; 32 uint32_t bitfields;
33 }; 33 };
34 34
35 COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxD ata_should_not_grow); 35 static_assert(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), "StyleBoxD ata should stay small");
36 36
37 StyleBoxData::StyleBoxData() 37 StyleBoxData::StyleBoxData()
38 : m_minWidth(RenderStyle::initialMinSize()) 38 : m_minWidth(RenderStyle::initialMinSize())
39 , m_maxWidth(RenderStyle::initialMaxSize()) 39 , m_maxWidth(RenderStyle::initialMaxSize())
40 , m_minHeight(RenderStyle::initialMinSize()) 40 , m_minHeight(RenderStyle::initialMinSize())
41 , m_maxHeight(RenderStyle::initialMaxSize()) 41 , m_maxHeight(RenderStyle::initialMaxSize())
42 , m_zIndex(0) 42 , m_zIndex(0)
43 , m_hasAutoZIndex(true) 43 , m_hasAutoZIndex(true)
44 , m_boxSizing(CONTENT_BOX) 44 , m_boxSizing(CONTENT_BOX)
45 , m_boxDecorationBreak(DSLICE) 45 , m_boxDecorationBreak(DSLICE)
(...skipping 26 matching lines...) Expand all
72 && m_maxHeight == o.m_maxHeight 72 && m_maxHeight == o.m_maxHeight
73 && m_verticalAlign == o.m_verticalAlign 73 && m_verticalAlign == o.m_verticalAlign
74 && m_zIndex == o.m_zIndex 74 && m_zIndex == o.m_zIndex
75 && m_hasAutoZIndex == o.m_hasAutoZIndex 75 && m_hasAutoZIndex == o.m_hasAutoZIndex
76 && m_boxSizing == o.m_boxSizing 76 && m_boxSizing == o.m_boxSizing
77 && m_boxDecorationBreak == o.m_boxDecorationBreak 77 && m_boxDecorationBreak == o.m_boxDecorationBreak
78 ; 78 ;
79 } 79 }
80 80
81 } // namespace blink 81 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.cpp ('k') | Source/core/rendering/style/StyleRareInheritedData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698