| 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 LayoutUnit m_paintInvalidationLogicalTop; | 491 LayoutUnit m_paintInvalidationLogicalTop; |
| 492 LayoutUnit m_paintInvalidationLogicalBottom; | 492 LayoutUnit m_paintInvalidationLogicalBottom; |
| 493 | 493 |
| 494 virtual bool isSelfCollapsingBlock() const override; | 494 virtual bool isSelfCollapsingBlock() const override; |
| 495 | 495 |
| 496 protected: | 496 protected: |
| 497 OwnPtr<LayoutBlockFlowRareData> m_rareData; | 497 OwnPtr<LayoutBlockFlowRareData> m_rareData; |
| 498 OwnPtr<FloatingObjects> m_floatingObjects; | 498 OwnPtr<FloatingObjects> m_floatingObjects; |
| 499 | 499 |
| 500 friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos
itionNewFloatOnLine, if we move those out from the private scope/add a helper to
LineBreaker, we can remove this friend | 500 friend class BreakingContext; // FIXME: It uses insertFloatingObject and pos
itionNewFloatOnLine, if we move those out from the private scope/add a helper to
LineBreaker, we can remove this friend |
| 501 friend class LineLayoutBlockFlow; |
| 501 friend class MarginInfo; | 502 friend class MarginInfo; |
| 502 friend class LineBreaker; | 503 friend class LineBreaker; |
| 503 friend class LineWidth; // needs to know FloatingObject | 504 friend class LineWidth; // needs to know FloatingObject |
| 504 | 505 |
| 505 // FIXME-BLOCKFLOW: These methods have implementations in | 506 // FIXME-BLOCKFLOW: These methods have implementations in |
| 506 // LayoutBlockFlowLine. They should be moved to the proper header once the | 507 // LayoutBlockFlowLine. They should be moved to the proper header once the |
| 507 // line layout code is separated from LayoutBlock and LayoutBlockFlow. | 508 // line layout code is separated from LayoutBlock and LayoutBlockFlow. |
| 508 // START METHODS DEFINED IN LayoutBlockFlowLine | 509 // START METHODS DEFINED IN LayoutBlockFlowLine |
| 509 private: | 510 private: |
| 510 InlineFlowBox* createLineBoxes(LayoutObject*, const LineInfo&, InlineBox* ch
ildBox); | 511 InlineFlowBox* createLineBoxes(LayoutObject*, const LineInfo&, InlineBox* ch
ildBox); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 538 | 539 |
| 539 // END METHODS DEFINED IN LayoutBlockFlowLine | 540 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 540 | 541 |
| 541 }; | 542 }; |
| 542 | 543 |
| 543 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 544 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 544 | 545 |
| 545 } // namespace blink | 546 } // namespace blink |
| 546 | 547 |
| 547 #endif // LayoutBlockFlow_h | 548 #endif // LayoutBlockFlow_h |
| OLD | NEW |