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

Side by Side Diff: Source/core/rendering/RenderBlock.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 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 using namespace HTMLNames; 77 using namespace HTMLNames;
78 78
79 struct SameSizeAsRenderBlock : public RenderBox { 79 struct SameSizeAsRenderBlock : public RenderBox {
80 RenderObjectChildList children; 80 RenderObjectChildList children;
81 RenderLineBoxList lineBoxes; 81 RenderLineBoxList lineBoxes;
82 int pageLogicalOffset; 82 int pageLogicalOffset;
83 uint32_t bitfields; 83 uint32_t bitfields;
84 }; 84 };
85 85
86 COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock _should_stay_small); 86 static_assert(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), "RenderBlock should stay small");
87 87
88 typedef WTF::HashMap<const RenderBox*, OwnPtr<ColumnInfo> > ColumnInfoMap; 88 typedef WTF::HashMap<const RenderBox*, OwnPtr<ColumnInfo> > ColumnInfoMap;
89 static ColumnInfoMap* gColumnInfoMap = 0; 89 static ColumnInfoMap* gColumnInfoMap = 0;
90 90
91 static TrackedDescendantsMap* gPositionedDescendantsMap = 0; 91 static TrackedDescendantsMap* gPositionedDescendantsMap = 0;
92 static TrackedDescendantsMap* gPercentHeightDescendantsMap = 0; 92 static TrackedDescendantsMap* gPercentHeightDescendantsMap = 0;
93 93
94 static TrackedContainerMap* gPositionedContainerMap = 0; 94 static TrackedContainerMap* gPositionedContainerMap = 0;
95 static TrackedContainerMap* gPercentHeightContainerMap = 0; 95 static TrackedContainerMap* gPercentHeightContainerMap = 0;
96 96
(...skipping 3815 matching lines...) Expand 10 before | Expand all | Expand 10 after
3912 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 3912 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
3913 { 3913 {
3914 showRenderObject(); 3914 showRenderObject();
3915 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3915 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3916 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3916 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3917 } 3917 }
3918 3918
3919 #endif 3919 #endif
3920 3920
3921 } // namespace blink 3921 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/PointerEventsHitRules.cpp ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698