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

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

Issue 1969203003: Move makeChildrenInlineIfPossible to 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 private: 382 private:
383 LayoutObjectChildList* virtualChildren() final { return children(); } 383 LayoutObjectChildList* virtualChildren() final { return children(); }
384 const LayoutObjectChildList* virtualChildren() const final { return children (); } 384 const LayoutObjectChildList* virtualChildren() const final { return children (); }
385 385
386 bool isLayoutBlock() const final { return true; } 386 bool isLayoutBlock() const final { return true; }
387 387
388 void makeChildrenNonInline(LayoutObject* insertionPoint = nullptr); 388 void makeChildrenNonInline(LayoutObject* insertionPoint = nullptr);
389 389
390 virtual void removeLeftoverAnonymousBlock(LayoutBlock* child); 390 virtual void removeLeftoverAnonymousBlock(LayoutBlock* child);
391 391
392 void makeChildrenInlineIfPossible();
393
394 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); } 392 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); }
395 393
396 TrackedLayoutBoxListHashSet* positionedObjectsInternal() const; 394 TrackedLayoutBoxListHashSet* positionedObjectsInternal() const;
397 TrackedLayoutBoxListHashSet* percentHeightDescendantsInternal() const; 395 TrackedLayoutBoxListHashSet* percentHeightDescendantsInternal() const;
398 396
399 // Returns true if the positioned movement-only layout succeeded. 397 // Returns true if the positioned movement-only layout succeeded.
400 bool tryLayoutDoingPositionedMovementOnly(); 398 bool tryLayoutDoingPositionedMovementOnly();
401 399
402 bool avoidsFloats() const override { return true; } 400 bool avoidsFloats() const override { return true; }
403 401
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 // FIXME: This is temporary as we move code that accesses block flow 481 // FIXME: This is temporary as we move code that accesses block flow
484 // member variables out of LayoutBlock and into LayoutBlockFlow. 482 // member variables out of LayoutBlock and into LayoutBlockFlow.
485 friend class LayoutBlockFlow; 483 friend class LayoutBlockFlow;
486 }; 484 };
487 485
488 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock()); 486 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
489 487
490 } // namespace blink 488 } // namespace blink
491 489
492 #endif // LayoutBlock_h 490 #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