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