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

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

Issue 2505943003: Rename positionNewFloats() to placeNewFloats(). (Closed)
Patch Set: Created 4 years, 1 month 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/LayoutBlockFlow.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-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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 return child.y() + child.layoutObject()->marginTop(); 341 return child.y() + child.layoutObject()->marginTop();
342 } 342 }
343 343
344 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&, 344 LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&,
345 const LayoutPoint&) const; 345 const LayoutPoint&) const;
346 346
347 const char* name() const override { return "LayoutBlockFlow"; } 347 const char* name() const override { return "LayoutBlockFlow"; }
348 348
349 FloatingObject* insertFloatingObject(LayoutBox&); 349 FloatingObject* insertFloatingObject(LayoutBox&);
350 350
351 // Position all floats that have not yet been positioned. 351 // Position and lay out all floats that have not yet been positioned.
352 // 352 //
353 // |logicalTop| is the minimum logical top for the floats. The final logical 353 // This will mark them as "placed", which means that they have found their
354 // top of the floats will also be affected by clearance and space available 354 // final location in this layout pass.
355 // after having positioned earlier floats.
356 // 355 //
357 // Returns true if and only if it has positioned any floats. 356 // |logicalTopMarginEdge| is the minimum logical top for the floats. The
358 bool positionNewFloats(LayoutUnit logicalTop, LineWidth* = nullptr); 357 // final logical top of the floats will also be affected by clearance and
358 // space available after having positioned earlier floats.
359 //
360 // Returns true if and only if it has placed any floats.
361 bool placeNewFloats(LayoutUnit logicalTopMarginEdge, LineWidth* = nullptr);
359 362
360 // Position and lay out the float, if it needs layout. 363 // Position and lay out the float, if it needs layout.
361 // |logicalTop| is the minimum logical top offset for the float (margin edge). 364 // |logicalTopMarginEdge| is the minimum logical top offset for the float.
362 // The value returned is the minimum logical top offset for subsequent floats. 365 // The value returned is the minimum logical top offset for subsequent
363 LayoutUnit positionAndLayoutFloat(FloatingObject&, LayoutUnit logicalTop); 366 // floats.
367 LayoutUnit positionAndLayoutFloat(FloatingObject&,
368 LayoutUnit logicalTopMarginEdge);
364 369
365 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit) const; 370 LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit) const;
366 LayoutUnit nextFloatLogicalBottomBelowForBlock(LayoutUnit) const; 371 LayoutUnit nextFloatLogicalBottomBelowForBlock(LayoutUnit) const;
367 372
368 FloatingObject* lastFloatFromPreviousLine() const { 373 FloatingObject* lastFloatFromPreviousLine() const {
369 return containsFloats() ? m_floatingObjects->set().last().get() : nullptr; 374 return containsFloats() ? m_floatingObjects->set().last().get() : nullptr;
370 } 375 }
371 376
372 void setShouldDoFullPaintInvalidationForFirstLine(); 377 void setShouldDoFullPaintInvalidationForFirstLine();
373 378
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 void positionDialog(); 934 void positionDialog();
930 935
931 // END METHODS DEFINED IN LayoutBlockFlowLine 936 // END METHODS DEFINED IN LayoutBlockFlowLine
932 }; 937 };
933 938
934 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 939 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
935 940
936 } // namespace blink 941 } // namespace blink
937 942
938 #endif // LayoutBlockFlow_h 943 #endif // LayoutBlockFlow_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698