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

Side by Side Diff: third_party/WebKit/Source/core/layout/line/InlineBox.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) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi s); } 302 DisplayItemClient displayItemClient() const { return toDisplayItemClient(thi s); }
303 303
304 #define ADD_BOOLEAN_BITFIELD(name, Name) \ 304 #define ADD_BOOLEAN_BITFIELD(name, Name) \
305 private:\ 305 private:\
306 unsigned m_##name : 1;\ 306 unsigned m_##name : 1;\
307 public:\ 307 public:\
308 bool name() const { return m_##name; }\ 308 bool name() const { return m_##name; }\
309 void set##Name(bool name) { m_##name = name; }\ 309 void set##Name(bool name) { m_##name = name; }\
310 310
311 class InlineBoxBitfields { 311 class InlineBoxBitfields {
312 DISALLOW_ALLOCATION(); 312 DISALLOW_NEW();
313 public: 313 public:
314 InlineBoxBitfields(bool firstLine = false, bool constructed = false, boo l dirty = false, bool extracted = false, bool isHorizontal = true) 314 InlineBoxBitfields(bool firstLine = false, bool constructed = false, boo l dirty = false, bool extracted = false, bool isHorizontal = true)
315 : m_firstLine(firstLine) 315 : m_firstLine(firstLine)
316 , m_constructed(constructed) 316 , m_constructed(constructed)
317 , m_bidiEmbeddingLevel(0) 317 , m_bidiEmbeddingLevel(0)
318 , m_dirty(dirty) 318 , m_dirty(dirty)
319 , m_extracted(extracted) 319 , m_extracted(extracted)
320 , m_hasVirtualLogicalHeight(false) 320 , m_hasVirtualLogicalHeight(false)
321 , m_isHorizontal(isHorizontal) 321 , m_isHorizontal(isHorizontal)
322 , m_endsWithBreak(false) 322 , m_endsWithBreak(false)
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 443
444 } // namespace blink 444 } // namespace blink
445 445
446 #ifndef NDEBUG 446 #ifndef NDEBUG
447 // Outside the WebCore namespace for ease of invocation from gdb. 447 // Outside the WebCore namespace for ease of invocation from gdb.
448 void showTree(const blink::InlineBox*); 448 void showTree(const blink::InlineBox*);
449 void showLineTree(const blink::InlineBox*); 449 void showLineTree(const blink::InlineBox*);
450 #endif 450 #endif
451 451
452 #endif // InlineBox_h 452 #endif // InlineBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698