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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTable.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 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, 2009, 2010 Apple Inc. All rights reserv ed. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserv ed.
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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 182 }
183 183
184 int calcBorderStart() const; 184 int calcBorderStart() const;
185 int calcBorderEnd() const; 185 int calcBorderEnd() const;
186 void recalcBordersInRowDirection(); 186 void recalcBordersInRowDirection();
187 187
188 void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) over ride; 188 void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) over ride;
189 void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObject* befo reChild = nullptr) override; 189 void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObject* befo reChild = nullptr) override;
190 190
191 struct ColumnStruct { 191 struct ColumnStruct {
192 ALLOW_ONLY_INLINE_ALLOCATION(); 192 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
193 explicit ColumnStruct(unsigned initialSpan = 1) 193 explicit ColumnStruct(unsigned initialSpan = 1)
194 : span(initialSpan) 194 : span(initialSpan)
195 { 195 {
196 } 196 }
197 197
198 unsigned span; 198 unsigned span;
199 }; 199 };
200 200
201 void forceSectionsRecalc() 201 void forceSectionsRecalc()
202 { 202 {
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 if (m_firstBody) 471 if (m_firstBody)
472 return m_firstBody; 472 return m_firstBody;
473 return m_foot; 473 return m_foot;
474 } 474 }
475 475
476 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTable, isTable()); 476 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTable, isTable());
477 477
478 } // namespace blink 478 } // namespace blink
479 479
480 #endif // LayoutTable_h 480 #endif // LayoutTable_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutState.h ('k') | third_party/WebKit/Source/core/layout/LayoutTableSection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698