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

Side by Side Diff: Source/core/rendering/RenderInline.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/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderObject.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) 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "platform/geometry/TransformState.h" 44 #include "platform/geometry/TransformState.h"
45 45
46 namespace blink { 46 namespace blink {
47 47
48 struct SameSizeAsRenderInline : public RenderBoxModelObject { 48 struct SameSizeAsRenderInline : public RenderBoxModelObject {
49 virtual ~SameSizeAsRenderInline() { } 49 virtual ~SameSizeAsRenderInline() { }
50 RenderObjectChildList m_children; 50 RenderObjectChildList m_children;
51 RenderLineBoxList m_lineBoxes; 51 RenderLineBoxList m_lineBoxes;
52 }; 52 };
53 53
54 COMPILE_ASSERT(sizeof(RenderInline) == sizeof(SameSizeAsRenderInline), RenderInl ine_should_stay_small); 54 static_assert(sizeof(RenderInline) == sizeof(SameSizeAsRenderInline), "RenderInl ine should stay small");
55 55
56 RenderInline::RenderInline(Element* element) 56 RenderInline::RenderInline(Element* element)
57 : RenderBoxModelObject(element) 57 : RenderBoxModelObject(element)
58 { 58 {
59 setChildrenInline(true); 59 setChildrenInline(true);
60 } 60 }
61 61
62 void RenderInline::trace(Visitor* visitor) 62 void RenderInline::trace(Visitor* visitor)
63 { 63 {
64 visitor->trace(m_children); 64 visitor->trace(m_children);
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 container = this; 1408 container = this;
1409 1409
1410 FloatPoint absPos = container->localToAbsolute(); 1410 FloatPoint absPos = container->localToAbsolute();
1411 region.bounds.setX(absPos.x() + region.bounds.x()); 1411 region.bounds.setX(absPos.x() + region.bounds.x());
1412 region.bounds.setY(absPos.y() + region.bounds.y()); 1412 region.bounds.setY(absPos.y() + region.bounds.y());
1413 1413
1414 regions.append(region); 1414 regions.append(region);
1415 } 1415 }
1416 1416
1417 } // namespace blink 1417 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698