| OLD | NEW |
| 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 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const; | 771 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const; |
| 772 | 772 |
| 773 private: | 773 private: |
| 774 LayoutUnit collapsedMarginBefore() const final { | 774 LayoutUnit collapsedMarginBefore() const final { |
| 775 return maxPositiveMarginBefore() - maxNegativeMarginBefore(); | 775 return maxPositiveMarginBefore() - maxNegativeMarginBefore(); |
| 776 } | 776 } |
| 777 LayoutUnit collapsedMarginAfter() const final { | 777 LayoutUnit collapsedMarginAfter() const final { |
| 778 return maxPositiveMarginAfter() - maxNegativeMarginAfter(); | 778 return maxPositiveMarginAfter() - maxNegativeMarginAfter(); |
| 779 } | 779 } |
| 780 | 780 |
| 781 LayoutUnit adjustedMarginBeforeForPagination( |
| 782 const LayoutBox&, |
| 783 LayoutUnit logicalTopMarginEdge, |
| 784 LayoutUnit logicalTopBorderEdge, |
| 785 const BlockChildrenLayoutInfo&) const; |
| 786 |
| 781 LayoutUnit collapseMargins(LayoutBox& child, | 787 LayoutUnit collapseMargins(LayoutBox& child, |
| 782 MarginInfo&, | 788 BlockChildrenLayoutInfo&, |
| 783 bool childIsSelfCollapsing, | 789 bool childIsSelfCollapsing, |
| 784 bool childDiscardMarginBefore, | 790 bool childDiscardMarginBefore, |
| 785 bool childDiscardMarginAfter); | 791 bool childDiscardMarginAfter); |
| 786 LayoutUnit clearFloatsIfNeeded(LayoutBox& child, | 792 LayoutUnit clearFloatsIfNeeded(LayoutBox& child, |
| 787 MarginInfo&, | 793 MarginInfo&, |
| 788 LayoutUnit oldTopPosMargin, | 794 LayoutUnit oldTopPosMargin, |
| 789 LayoutUnit oldTopNegMargin, | 795 LayoutUnit oldTopNegMargin, |
| 790 LayoutUnit yPos, | 796 LayoutUnit yPos, |
| 791 bool childIsSelfCollapsing, | 797 bool childIsSelfCollapsing, |
| 792 bool childDiscardMargin); | 798 bool childDiscardMargin); |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 void positionDialog(); | 946 void positionDialog(); |
| 941 | 947 |
| 942 // END METHODS DEFINED IN LayoutBlockFlowLine | 948 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 943 }; | 949 }; |
| 944 | 950 |
| 945 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 951 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 946 | 952 |
| 947 } // namespace blink | 953 } // namespace blink |
| 948 | 954 |
| 949 #endif // LayoutBlockFlow_h | 955 #endif // LayoutBlockFlow_h |
| OLD | NEW |