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

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

Issue 1966153002: Turn mergeContiguousAnonymousBlocks() into a proper method. (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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 // </div> 270 // </div>
271 // </div> 271 // </div>
272 // </div> 272 // </div>
273 273
274 // Returns the nearest enclosing block (including this block) that contribut es a first-line style to our first line. 274 // Returns the nearest enclosing block (including this block) that contribut es a first-line style to our first line.
275 const LayoutBlock* enclosingFirstLineStyleBlock() const; 275 const LayoutBlock* enclosingFirstLineStyleBlock() const;
276 // Returns this block or the nearest inner block containing the actual first line. 276 // Returns this block or the nearest inner block containing the actual first line.
277 LayoutBlockFlow* nearestInnerBlockWithFirstLine(); 277 LayoutBlockFlow* nearestInnerBlockWithFirstLine();
278 278
279 protected: 279 protected:
280 // Merge children of |siblingThatMayBeDeleted| into this object if possible, and delete
281 // |siblingThatMayBeDeleted|. Returns true if we were able to merge. In that case,
282 // |siblingThatMayBeDeleted| will be dead. We'll only be able to merge if bo th blocks are
283 // anonymous.
284 // TODO(mstensho): This belongs in LayoutBlockFlow, but needs to live here u ntil we have been
285 // able to move all callers down to LayoutBlockFlow.
286 bool mergeSiblingContiguousAnonymousBlock(LayoutBlockFlow* siblingThatMayBeD eleted);
287
280 // Reparent subsequent or preceding adjacent floating or out-of-flow sibling s into this object. 288 // Reparent subsequent or preceding adjacent floating or out-of-flow sibling s into this object.
281 // TODO(mstensho): This belongs in LayoutBlockFlow, but needs to live here u ntil we have been 289 // TODO(mstensho): This belongs in LayoutBlockFlow, but needs to live here u ntil we have been
282 // able to move all callers down to LayoutBlockFlow first. 290 // able to move all callers down to LayoutBlockFlow first.
283 void reparentSubsequentFloatingOrOutOfFlowSiblings(); 291 void reparentSubsequentFloatingOrOutOfFlowSiblings();
284 void reparentPrecedingFloatingOrOutOfFlowSiblings(); 292 void reparentPrecedingFloatingOrOutOfFlowSiblings();
285 293
286 void willBeDestroyed() override; 294 void willBeDestroyed() override;
287 295
288 void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&); 296 void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&);
289 297
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 // FIXME: This is temporary as we move code that accesses block flow 494 // FIXME: This is temporary as we move code that accesses block flow
487 // member variables out of LayoutBlock and into LayoutBlockFlow. 495 // member variables out of LayoutBlock and into LayoutBlockFlow.
488 friend class LayoutBlockFlow; 496 friend class LayoutBlockFlow;
489 }; 497 };
490 498
491 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 499 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
492 500
493 } // namespace blink 501 } // namespace blink
494 502
495 #endif // LayoutBlock_h 503 #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