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

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

Issue 1501053002: The column balancer should ignore things outside the bounds of the row. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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
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-2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * Copyright (C) 2013 Google Inc. All rights reserved. 7 * Copyright (C) 2013 Google Inc. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are 10 * modification, are permitted provided that the following conditions are
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 void removeFloatingObjectsFromDescendants(); 152 void removeFloatingObjectsFromDescendants();
153 void markAllDescendantsWithFloatsForLayout(LayoutBox* floatToRemove = nullpt r, bool inLayout = true); 153 void markAllDescendantsWithFloatsForLayout(LayoutBox* floatToRemove = nullpt r, bool inLayout = true);
154 void markSiblingsWithFloatsForLayout(LayoutBox* floatToRemove = nullptr); 154 void markSiblingsWithFloatsForLayout(LayoutBox* floatToRemove = nullptr);
155 155
156 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects ->set().isEmpty(); } 156 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects ->set().isEmpty(); }
157 bool containsFloat(LayoutBox*) const; 157 bool containsFloat(LayoutBox*) const;
158 158
159 void removeFloatingObjects(); 159 void removeFloatingObjects();
160 160
161 LayoutBoxModelObject* virtualContinuation() const final { return continuatio n(); }
162 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); }
163
164 using LayoutBoxModelObject::continuation;
165 using LayoutBoxModelObject::setContinuation;
166
161 LayoutInline* inlineElementContinuation() const; 167 LayoutInline* inlineElementContinuation() const;
162 168
163 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o verride; 169 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o verride;
164 void removeChild(LayoutObject*) override; 170 void removeChild(LayoutObject*) override;
165 171
166 void moveAllChildrenIncludingFloatsTo(LayoutBlock* toBlock, bool fullRemoveI nsert); 172 void moveAllChildrenIncludingFloatsTo(LayoutBlock* toBlock, bool fullRemoveI nsert);
167 173
168 void childBecameFloatingOrOutOfFlow(LayoutBox* child); 174 void childBecameFloatingOrOutOfFlow(LayoutBox* child);
169 void collapseAnonymousBlockChild(LayoutBlockFlow* child); 175 void collapseAnonymousBlockChild(LayoutBlockFlow* child);
170 176
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 677
672 // END METHODS DEFINED IN LayoutBlockFlowLine 678 // END METHODS DEFINED IN LayoutBlockFlowLine
673 679
674 }; 680 };
675 681
676 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 682 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
677 683
678 } // namespace blink 684 } // namespace blink
679 685
680 #endif // LayoutBlockFlow_h 686 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698