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

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

Issue 2359733002: Need to consider the need for a soft break even when inserting a forced break. (Closed)
Patch Set: Created 4 years, 3 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 LayoutSize accumulateInFlowPositionOffsets() const override; 358 LayoutSize accumulateInFlowPositionOffsets() const override;
359 359
360 private: 360 private:
361 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S ubtreeLayoutScope&); 361 bool layoutBlockFlow(bool relayoutChildren, LayoutUnit& pageLogicalHeight, S ubtreeLayoutScope&);
362 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU nit beforeEdge, LayoutUnit afterEdge); 362 void layoutBlockChildren(bool relayoutChildren, SubtreeLayoutScope&, LayoutU nit beforeEdge, LayoutUnit afterEdge);
363 363
364 void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, Layo utUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom); 364 void markDescendantsWithFloatsForLayoutIfNeeded(LayoutBlockFlow& child, Layo utUnit newLogicalTop, LayoutUnit previousFloatLogicalBottom);
365 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTo p, BlockChildrenLayoutInfo&); 365 bool positionAndLayoutOnceIfNeeded(LayoutBox& child, LayoutUnit newLogicalTo p, BlockChildrenLayoutInfo&);
366 366
367 // Handle breaking policy before the child, and insert a forced break in fro nt of it if needed. 367 // Handle breaking policy before the child, and insert a forced break in fro nt of it if needed.
368 // Returns true if a forced break was inserted. 368 void insertForcedBreakBeforeChildIfNeeded(LayoutBox& child, BlockChildrenLay outInfo&);
369 bool insertForcedBreakBeforeChildIfNeeded(LayoutBox& child, BlockChildrenLay outInfo&);
370 369
371 void layoutBlockChild(LayoutBox& child, BlockChildrenLayoutInfo&); 370 void layoutBlockChild(LayoutBox& child, BlockChildrenLayoutInfo&);
372 void adjustPositionedBlock(LayoutBox& child, const BlockChildrenLayoutInfo&) ; 371 void adjustPositionedBlock(LayoutBox& child, const BlockChildrenLayoutInfo&) ;
373 void adjustFloatingBlock(const MarginInfo&); 372 void adjustFloatingBlock(const MarginInfo&);
374 373
375 LayoutPoint computeLogicalLocationForFloat(const FloatingObject&, LayoutUnit logicalTopOffset) const; 374 LayoutPoint computeLogicalLocationForFloat(const FloatingObject&, LayoutUnit logicalTopOffset) const;
376 375
377 void removeFloatingObject(LayoutBox*); 376 void removeFloatingObject(LayoutBox*);
378 void removeFloatingObjectsBelow(FloatingObject*, int logicalOffset); 377 void removeFloatingObjectsBelow(FloatingObject*, int logicalOffset);
379 378
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 662
664 // END METHODS DEFINED IN LayoutBlockFlowLine 663 // END METHODS DEFINED IN LayoutBlockFlowLine
665 664
666 }; 665 };
667 666
668 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); 667 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow());
669 668
670 } // namespace blink 669 } // namespace blink
671 670
672 #endif // LayoutBlockFlow_h 671 #endif // LayoutBlockFlow_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698