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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.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) 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, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 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 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 void clearExtraInlineAndBlockOffests(); 520 void clearExtraInlineAndBlockOffests();
521 521
522 LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool * offsetDependsOnPoint = nullptr) const override; 522 LayoutSize offsetFromContainer(const LayoutObject*, const LayoutPoint&, bool * offsetDependsOnPoint = nullptr) const override;
523 523
524 LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const; 524 LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
525 LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const ; 525 LayoutUnit adjustBorderBoxLogicalHeightForBoxSizing(LayoutUnit height) const ;
526 LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const; 526 LayoutUnit adjustContentBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
527 LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit height) cons t; 527 LayoutUnit adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit height) cons t;
528 528
529 struct ComputedMarginValues { 529 struct ComputedMarginValues {
530 DISALLOW_ALLOCATION(); 530 DISALLOW_NEW();
531 ComputedMarginValues() { } 531 ComputedMarginValues() { }
532 532
533 LayoutUnit m_before; 533 LayoutUnit m_before;
534 LayoutUnit m_after; 534 LayoutUnit m_after;
535 LayoutUnit m_start; 535 LayoutUnit m_start;
536 LayoutUnit m_end; 536 LayoutUnit m_end;
537 }; 537 };
538 struct LogicalExtentComputedValues { 538 struct LogicalExtentComputedValues {
539 STACK_ALLOCATED(); 539 STACK_ALLOCATED();
540 LogicalExtentComputedValues() { } 540 LogicalExtentComputedValues() { }
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 if (UNLIKELY(inlineBoxWrapper() != nullptr)) 1055 if (UNLIKELY(inlineBoxWrapper() != nullptr))
1056 deleteLineBoxWrapper(); 1056 deleteLineBoxWrapper();
1057 } 1057 }
1058 1058
1059 ensureRareData().m_inlineBoxWrapper = boxWrapper; 1059 ensureRareData().m_inlineBoxWrapper = boxWrapper;
1060 } 1060 }
1061 1061
1062 } // namespace blink 1062 } // namespace blink
1063 1063
1064 #endif // LayoutBox_h 1064 #endif // LayoutBox_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.h ('k') | third_party/WebKit/Source/core/layout/LayoutFrameSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698