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

Side by Side Diff: Source/core/rendering/InlineBox.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
« no previous file with comments | « Source/core/rendering/FloatingObjects.cpp ('k') | Source/core/rendering/InlineFlowBox.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 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 28 matching lines...) Expand all
39 virtual ~SameSizeAsInlineBox() { } 39 virtual ~SameSizeAsInlineBox() { }
40 void* a[4]; 40 void* a[4];
41 FloatPointWillBeLayoutPoint b; 41 FloatPointWillBeLayoutPoint b;
42 FloatWillBeLayoutUnit c; 42 FloatWillBeLayoutUnit c;
43 uint32_t d : 32; 43 uint32_t d : 32;
44 #if ENABLE(ASSERT) 44 #if ENABLE(ASSERT)
45 bool f; 45 bool f;
46 #endif 46 #endif
47 }; 47 };
48 48
49 COMPILE_ASSERT(sizeof(InlineBox) == sizeof(SameSizeAsInlineBox), InlineBox_size_ guard); 49 static_assert(sizeof(InlineBox) == sizeof(SameSizeAsInlineBox), "InlineBox shoul d stay small");
50 50
51 #if ENABLE(ASSERT) 51 #if ENABLE(ASSERT)
52 52
53 InlineBox::~InlineBox() 53 InlineBox::~InlineBox()
54 { 54 {
55 if (!m_hasBadParent && m_parent) 55 if (!m_hasBadParent && m_parent)
56 m_parent->setHasBadChildList(); 56 m_parent->setHasBadChildList();
57 } 57 }
58 58
59 #endif 59 #endif
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 b->showTreeForThis(); 358 b->showTreeForThis();
359 } 359 }
360 360
361 void showLineTree(const blink::InlineBox* b) 361 void showLineTree(const blink::InlineBox* b)
362 { 362 {
363 if (b) 363 if (b)
364 b->showLineTreeForThis(); 364 b->showLineTreeForThis();
365 } 365 }
366 366
367 #endif 367 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/FloatingObjects.cpp ('k') | Source/core/rendering/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698