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

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

Issue 1899193007: Remove special-code for paginating floats followed by lines of text. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&, const Lay outPoint&) const; 261 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&, const Lay outPoint&) const;
262 262
263 const char* name() const override { return "LayoutBlockFlow"; } 263 const char* name() const override { return "LayoutBlockFlow"; }
264 264
265 FloatingObject* insertFloatingObject(LayoutBox&); 265 FloatingObject* insertFloatingObject(LayoutBox&);
266 266
267 // Called from lineWidth, to position the floats added in the last line. 267 // Called from lineWidth, to position the floats added in the last line.
268 // Returns true if and only if it has positioned any floats. 268 // Returns true if and only if it has positioned any floats.
269 bool positionNewFloats(LineWidth* = nullptr); 269 bool positionNewFloats(LineWidth* = nullptr);
270 270
271 bool positionNewFloatOnLine(FloatingObject& newFloat, FloatingObject* lastFl oatFromPreviousLine, LineInfo&, LineWidth&);
272
273 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit) const; 271 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit) const;
274 LayoutUnit nextFloatLogicalBottomBelowForBlock(LayoutUnit) const; 272 LayoutUnit nextFloatLogicalBottomBelowForBlock(LayoutUnit) const;
275 273
276 FloatingObject* lastFloatFromPreviousLine() const 274 FloatingObject* lastFloatFromPreviousLine() const
277 { 275 {
278 return containsFloats() ? m_floatingObjects->set().last().get() : nullpt r; 276 return containsFloats() ? m_floatingObjects->set().last().get() : nullpt r;
279 } 277 }
280 278
281 void invalidateDisplayItemClientsOfFirstLine(); 279 void invalidateDisplayItemClientsOfFirstLine();
282 280
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 605
608 // END METHODS DEFINED IN LayoutBlockFlowLine 606 // END METHODS DEFINED IN LayoutBlockFlowLine
609 607
610 }; 608 };
611 609
612 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 610 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
613 611
614 } // namespace blink 612 } // namespace blink
615 613
616 #endif // LayoutBlockFlow_h 614 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/FloatingObjects.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698