| 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 FloatingObject::Type = FloatingObject::FloatLeftRight) const; | 370 FloatingObject::Type = FloatingObject::FloatLeftRight) const; |
| 371 | 371 |
| 372 bool hasOverhangingFloats() const { | 372 bool hasOverhangingFloats() const { |
| 373 return parent() && containsFloats() && | 373 return parent() && containsFloats() && |
| 374 lowestFloatLogicalBottom() > logicalHeight(); | 374 lowestFloatLogicalBottom() > logicalHeight(); |
| 375 } | 375 } |
| 376 bool isOverhangingFloat(const FloatingObject& floatObject) const { | 376 bool isOverhangingFloat(const FloatingObject& floatObject) const { |
| 377 return logicalBottomForFloat(floatObject) > logicalHeight(); | 377 return logicalBottomForFloat(floatObject) > logicalHeight(); |
| 378 } | 378 } |
| 379 | 379 |
| 380 LayoutUnit logicalHeightWithVisibleOverflow() const final; |
| 381 |
| 380 // This function is only public so we can call it from NGBox while we're | 382 // This function is only public so we can call it from NGBox while we're |
| 381 // still working on LayoutNG. | 383 // still working on LayoutNG. |
| 382 void updateIsSelfCollapsing() { | 384 void updateIsSelfCollapsing() { |
| 383 m_isSelfCollapsing = checkIfIsSelfCollapsingBlock(); | 385 m_isSelfCollapsing = checkIfIsSelfCollapsingBlock(); |
| 384 } | 386 } |
| 385 | 387 |
| 386 #ifndef NDEBUG | 388 #ifndef NDEBUG |
| 387 void showLineTreeAndMark(const InlineBox* = nullptr, | 389 void showLineTreeAndMark(const InlineBox* = nullptr, |
| 388 const char* = nullptr, | 390 const char* = nullptr, |
| 389 const InlineBox* = nullptr, | 391 const InlineBox* = nullptr, |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 void positionDialog(); | 926 void positionDialog(); |
| 925 | 927 |
| 926 // END METHODS DEFINED IN LayoutBlockFlowLine | 928 // END METHODS DEFINED IN LayoutBlockFlowLine |
| 927 }; | 929 }; |
| 928 | 930 |
| 929 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); | 931 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlockFlow, isLayoutBlockFlow()); |
| 930 | 932 |
| 931 } // namespace blink | 933 } // namespace blink |
| 932 | 934 |
| 933 #endif // LayoutBlockFlow_h | 935 #endif // LayoutBlockFlow_h |
| OLD | NEW |