| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 void removeFloatingObjectsFromDescendants(); | 147 void removeFloatingObjectsFromDescendants(); |
| 148 void markAllDescendantsWithFloatsForLayout(LayoutBox* floatToRemove = nullpt
r, bool inLayout = true); | 148 void markAllDescendantsWithFloatsForLayout(LayoutBox* floatToRemove = nullpt
r, bool inLayout = true); |
| 149 void markSiblingsWithFloatsForLayout(LayoutBox* floatToRemove = nullptr); | 149 void markSiblingsWithFloatsForLayout(LayoutBox* floatToRemove = nullptr); |
| 150 | 150 |
| 151 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects
->set().isEmpty(); } | 151 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects
->set().isEmpty(); } |
| 152 bool containsFloat(LayoutBox*) const; | 152 bool containsFloat(LayoutBox*) const; |
| 153 | 153 |
| 154 void removeFloatingObjects(); | 154 void removeFloatingObjects(); |
| 155 | 155 |
| 156 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o
verride; | 156 void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) o
verride; |
| 157 void removeChild(LayoutObject*) override; |
| 157 | 158 |
| 158 void moveAllChildrenIncludingFloatsTo(LayoutBlock* toBlock, bool fullRemoveI
nsert); | 159 void moveAllChildrenIncludingFloatsTo(LayoutBlock* toBlock, bool fullRemoveI
nsert); |
| 159 | 160 |
| 160 bool generatesLineBoxesForInlineChild(LayoutObject*); | 161 bool generatesLineBoxesForInlineChild(LayoutObject*); |
| 161 | 162 |
| 162 LayoutUnit logicalTopForFloat(const FloatingObject& floatingObject) const {
return isHorizontalWritingMode() ? floatingObject.y() : floatingObject.x(); } | 163 LayoutUnit logicalTopForFloat(const FloatingObject& floatingObject) const {
return isHorizontalWritingMode() ? floatingObject.y() : floatingObject.x(); } |
| 163 LayoutUnit logicalBottomForFloat(const FloatingObject& floatingObject) const
{ return isHorizontalWritingMode() ? floatingObject.maxY() : floatingObject.max
X(); } | 164 LayoutUnit logicalBottomForFloat(const FloatingObject& floatingObject) const
{ return isHorizontalWritingMode() ? floatingObject.maxY() : floatingObject.max
X(); } |
| 164 LayoutUnit logicalLeftForFloat(const FloatingObject& floatingObject) const {
return isHorizontalWritingMode() ? floatingObject.x() : floatingObject.y(); } | 165 LayoutUnit logicalLeftForFloat(const FloatingObject& floatingObject) const {
return isHorizontalWritingMode() ? floatingObject.x() : floatingObject.y(); } |
| 165 LayoutUnit logicalRightForFloat(const FloatingObject& floatingObject) const
{ return isHorizontalWritingMode() ? floatingObject.maxX() : floatingObject.maxY
(); } | 166 LayoutUnit logicalRightForFloat(const FloatingObject& floatingObject) const
{ return isHorizontalWritingMode() ? floatingObject.maxX() : floatingObject.maxY
(); } |
| 166 LayoutUnit logicalWidthForFloat(const FloatingObject& floatingObject) const
{ return isHorizontalWritingMode() ? floatingObject.width() : floatingObject.hei
ght(); } | 167 LayoutUnit logicalWidthForFloat(const FloatingObject& floatingObject) const
{ return isHorizontalWritingMode() ? floatingObject.width() : floatingObject.hei
ght(); } |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 | 627 |
| 627 // END METHODS DEFINED IN LayoutBlockFlowLine | 628 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 628 | 629 |
| 629 }; | 630 }; |
| 630 | 631 |
| 631 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 632 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 632 | 633 |
| 633 } // namespace blink | 634 } // namespace blink |
| 634 | 635 |
| 635 #endif // LayoutBlockFlow_h | 636 #endif // LayoutBlockFlow_h |
| OLD | NEW |