Source/core/rendering/RenderTableCell.cpp - Issue 811843003: replace COMPILE_ASSERT with static_assert in core/rendering/

Side by Side Diff: Source/core/rendering/RenderTableCell.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/RenderObject.cpp ('k') | Source/core/rendering/RenderTableSection.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)	2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)

3 * (C) 1997 Torben Weis (weis@kde.org)	3 * (C) 1997 Torben Weis (weis@kde.org)

4 * (C) 1998 Waldo Bastian (bastian@kde.org)	4 * (C) 1998 Waldo Bastian (bastian@kde.org)

5 * (C) 1999 Lars Knoll (knoll@kde.org)	5 * (C) 1999 Lars Knoll (knoll@kde.org)

6 * (C) 1999 Antti Koivisto (koivisto@kde.org)	6 * (C) 1999 Antti Koivisto (koivisto@kde.org)

7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.	7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.

8 *	8 *

9 * This library is free software; you can redistribute it and/or	9 * This library is free software; you can redistribute it and/or

10 * modify it under the terms of the GNU Library General Public	10 * modify it under the terms of the GNU Library General Public

(...skipping 29 matching lines...) Expand all Loading...
40	40

41 namespace blink {	41 namespace blink {

42	42

43 using namespace HTMLNames;	43 using namespace HTMLNames;

44	44

45 struct SameSizeAsRenderTableCell : public RenderBlockFlow {	45 struct SameSizeAsRenderTableCell : public RenderBlockFlow {

46 unsigned bitfields;	46 unsigned bitfields;

47 int paddings[2];	47 int paddings[2];

48 };	48 };

49	49

50 COMPILE_ASSERT(sizeof(RenderTableCell) == sizeof(SameSizeAsRenderTableCell), Ren derTableCell_should_stay_small);	50 static_assert(sizeof(RenderTableCell) == sizeof(SameSizeAsRenderTableCell), "Ren derTableCell should stay small");

51 COMPILE_ASSERT(sizeof(CollapsedBorderValue) == 8, CollapsedBorderValue_should_st ay_small);	51 static_assert(sizeof(CollapsedBorderValue) == 8, "CollapsedBorderValue should st ay small");

52	52

53 RenderTableCell::RenderTableCell(Element* element)	53 RenderTableCell::RenderTableCell(Element* element)

54 : RenderBlockFlow(element)	54 : RenderBlockFlow(element)

55 , m_column(unsetColumnIndex)	55 , m_column(unsetColumnIndex)

56 , m_cellWidthChanged(false)	56 , m_cellWidthChanged(false)

57 , m_intrinsicPaddingBefore(0)	57 , m_intrinsicPaddingBefore(0)

58 , m_intrinsicPaddingAfter(0)	58 , m_intrinsicPaddingAfter(0)

59 {	59 {

60 // We only update the flags when notified of DOM changes in colSpanOrRowSpan Changed()	60 // We only update the flags when notified of DOM changes in colSpanOrRowSpan Changed()

61 // so we need to set their initial values here in case something asks for co lSpan()/rowSpan() before then.	61 // so we need to set their initial values here in case something asks for co lSpan()/rowSpan() before then.

(...skipping 983 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1045	1045

1046 RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const Render Object* parent)	1046 RenderTableCell* RenderTableCell::createAnonymousWithParentRenderer(const Render Object* parent)

1047 {	1047 {

1048 RenderTableCell* newCell = RenderTableCell::createAnonymous(&parent->documen t());	1048 RenderTableCell* newCell = RenderTableCell::createAnonymous(&parent->documen t());

1049 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), TABLE_CELL);	1049 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), TABLE_CELL);

1050 newCell->setStyle(newStyle.release());	1050 newCell->setStyle(newStyle.release());

1051 return newCell;	1051 return newCell;

1052 }	1052 }

1053	1053

1054 } // namespace blink	1054 } // namespace blink

OLD	NEW