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: third_party/WebKit/Source/core/layout/LayoutBlock.h

Issue 1977083002: Move line/continuation specific parts of willBeDestroyed() into LayoutBlockFlow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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 | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlock.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 * (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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 LayoutObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); } 117 LayoutObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
118 LayoutObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); } 118 LayoutObject* lastChild() const { ASSERT(children() == virtualChildren()); r eturn children()->lastChild(); }
119 119
120 // If you have a LayoutBlock, use firstChild or lastChild instead. 120 // If you have a LayoutBlock, use firstChild or lastChild instead.
121 void slowFirstChild() const = delete; 121 void slowFirstChild() const = delete;
122 void slowLastChild() const = delete; 122 void slowLastChild() const = delete;
123 123
124 const LayoutObjectChildList* children() const { return &m_children; } 124 const LayoutObjectChildList* children() const { return &m_children; }
125 LayoutObjectChildList* children() { return &m_children; } 125 LayoutObjectChildList* children() { return &m_children; }
126 126
127 bool beingDestroyed() const { return m_beingDestroyed; }
szager1 2016/05/16 16:56:40 Sorry to jump in here, but I don't like moving thi
mstensho (USE GERRIT) 2016/05/16 17:57:27 I moved it because the flag is now only set by Lay
128
129 // These two functions are overridden for inline-block. 127 // These two functions are overridden for inline-block.
130 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 128 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final;
131 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const override; 129 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const override;
132 130
133 LayoutUnit minLineHeightForReplacedObject(bool isFirstLine, LayoutUnit repla cedHeight) const; 131 LayoutUnit minLineHeightForReplacedObject(bool isFirstLine, LayoutUnit repla cedHeight) const;
134 132
135 bool createsNewFormattingContext() const; 133 bool createsNewFormattingContext() const;
136 134
137 const LineBoxList& lineBoxes() const { return m_lineBoxes; } 135 const LineBoxList& lineBoxes() const { return m_lineBoxes; }
138 LineBoxList* lineBoxes() { return &m_lineBoxes; } 136 LineBoxList* lineBoxes() { return &m_lineBoxes; }
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 // FIXME: This is temporary as we move code that accesses block flow 467 // FIXME: This is temporary as we move code that accesses block flow
470 // member variables out of LayoutBlock and into LayoutBlockFlow. 468 // member variables out of LayoutBlock and into LayoutBlockFlow.
471 friend class LayoutBlockFlow; 469 friend class LayoutBlockFlow;
472 }; 470 };
473 471
474 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 472 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
475 473
476 } // namespace blink 474 } // namespace blink
477 475
478 #endif // LayoutBlock_h 476 #endif // LayoutBlock_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698