Chromium Code Reviews| 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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 490 LayoutUnit m_paintInvalidationLogicalTop; | 490 LayoutUnit m_paintInvalidationLogicalTop; | 
| 491 LayoutUnit m_paintInvalidationLogicalBottom; | 491 LayoutUnit m_paintInvalidationLogicalBottom; | 
| 492 | 492 | 
| 493 virtual bool isSelfCollapsingBlock() const override; | 493 virtual bool isSelfCollapsingBlock() const override; | 
| 494 | 494 | 
| 495 protected: | 495 protected: | 
| 496 OwnPtr<LayoutBlockFlowRareData> m_rareData; | 496 OwnPtr<LayoutBlockFlowRareData> m_rareData; | 
| 497 OwnPtr<FloatingObjects> m_floatingObjects; | 497 OwnPtr<FloatingObjects> m_floatingObjects; | 
| 498 | 498 | 
| 499 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 | 499 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 LineLayoutBlockFlow; | |
| 
 
esprehn
2015/06/17 20:16:26
Please no friends, expose API instead.
 
 | |
| 500 friend class MarginInfo; | 501 friend class MarginInfo; | 
| 501 friend class LineBreaker; | 502 friend class LineBreaker; | 
| 502 friend class LineWidth; // needs to know FloatingObject | 503 friend class LineWidth; // needs to know FloatingObject | 
| 503 | 504 | 
| 504 // FIXME-BLOCKFLOW: These methods have implementations in | 505 // FIXME-BLOCKFLOW: These methods have implementations in | 
| 505 // LayoutBlockFlowLine. They should be moved to the proper header once the | 506 // LayoutBlockFlowLine. They should be moved to the proper header once the | 
| 506 // line layout code is separated from LayoutBlock and LayoutBlockFlow. | 507 // line layout code is separated from LayoutBlock and LayoutBlockFlow. | 
| 507 // START METHODS DEFINED IN LayoutBlockFlowLine | 508 // START METHODS DEFINED IN LayoutBlockFlowLine | 
| 508 private: | 509 private: | 
| 509 InlineFlowBox* createLineBoxes(LayoutObject*, const LineInfo&, InlineBox* ch ildBox); | 510 InlineFlowBox* createLineBoxes(LayoutObject*, const LineInfo&, InlineBox* ch ildBox); | 
| (...skipping 26 matching lines...) Expand all Loading... | |
| 536 | 537 | 
| 537 // END METHODS DEFINED IN LayoutBlockFlowLine | 538 // END METHODS DEFINED IN LayoutBlockFlowLine | 
| 538 | 539 | 
| 539 }; | 540 }; | 
| 540 | 541 | 
| 541 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 542 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 
| 542 | 543 | 
| 543 } // namespace blink | 544 } // namespace blink | 
| 544 | 545 | 
| 545 #endif // LayoutBlockFlow_h | 546 #endif // LayoutBlockFlow_h | 
| OLD | NEW |