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

Side by Side Diff: Source/core/rendering/style/StyleRareInheritedData.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, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 Length lengths[1]; 44 Length lengths[1];
45 float secondFloat; 45 float secondFloat;
46 unsigned m_bitfields[2]; 46 unsigned m_bitfields[2];
47 short pagedMediaShorts[2]; 47 short pagedMediaShorts[2];
48 unsigned unsigneds[1]; 48 unsigned unsigneds[1];
49 short hyphenationShorts[3]; 49 short hyphenationShorts[3];
50 50
51 Color touchColors; 51 Color touchColors;
52 }; 52 };
53 53
54 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 54 static_assert(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheri tedData), "StyleRareInheritedData should stay small");
55 55
56 StyleRareInheritedData::StyleRareInheritedData() 56 StyleRareInheritedData::StyleRareInheritedData()
57 : listStyleImage(RenderStyle::initialListStyleImage()) 57 : listStyleImage(RenderStyle::initialListStyleImage())
58 , textStrokeWidth(RenderStyle::initialTextStrokeWidth()) 58 , textStrokeWidth(RenderStyle::initialTextStrokeWidth())
59 , indent(RenderStyle::initialTextIndent()) 59 , indent(RenderStyle::initialTextIndent())
60 , m_effectiveZoom(RenderStyle::initialZoom()) 60 , m_effectiveZoom(RenderStyle::initialZoom())
61 , widows(RenderStyle::initialWidows()) 61 , widows(RenderStyle::initialWidows())
62 , orphans(RenderStyle::initialOrphans()) 62 , orphans(RenderStyle::initialOrphans())
63 , m_hasAutoWidows(true) 63 , m_hasAutoWidows(true)
64 , m_hasAutoOrphans(true) 64 , m_hasAutoOrphans(true)
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 { 221 {
222 return dataEquivalent(textShadow.get(), o.textShadow.get()); 222 return dataEquivalent(textShadow.get(), o.textShadow.get());
223 } 223 }
224 224
225 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 225 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
226 { 226 {
227 return dataEquivalent(quotes, o.quotes); 227 return dataEquivalent(quotes, o.quotes);
228 } 228 }
229 229
230 } // namespace blink 230 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleBoxData.cpp ('k') | Source/core/rendering/svg/SVGInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698