| 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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 if (!m_rareData) | 724 if (!m_rareData) |
| 725 m_rareData = adoptPtr(new RenderBoxRareData()); | 725 m_rareData = adoptPtr(new RenderBoxRareData()); |
| 726 return *m_rareData.get(); | 726 return *m_rareData.get(); |
| 727 } | 727 } |
| 728 | 728 |
| 729 void savePreviousBorderBoxSizeIfNeeded(); | 729 void savePreviousBorderBoxSizeIfNeeded(); |
| 730 bool logicalHeightComputesAsNone(SizeType) const; | 730 bool logicalHeightComputesAsNone(SizeType) const; |
| 731 | 731 |
| 732 void invalidatePaintIfNeeded(const PaintInvalidationState&, const RenderLaye
rModelObject& newPaintInvalidationContainer); | 732 void invalidatePaintIfNeeded(const PaintInvalidationState&, const RenderLaye
rModelObject& newPaintInvalidationContainer); |
| 733 | 733 |
| 734 private: | 734 bool isBox() const WTF_DELETED_FUNCTION; // This will catch anyone doing an
unnecessary check. |
| 735 |
| 735 // The width/height of the contents + borders + padding. The x/y location i
s relative to our container (which is not always our parent). | 736 // The width/height of the contents + borders + padding. The x/y location i
s relative to our container (which is not always our parent). |
| 736 LayoutRect m_frameRect; | 737 LayoutRect m_frameRect; |
| 737 | 738 |
| 738 // Our intrinsic height, used for min-height: min-content etc. Maintained by | 739 // Our intrinsic height, used for min-height: min-content etc. Maintained by |
| 739 // updateLogicalHeight. This is logicalHeight() before it is clamped to | 740 // updateLogicalHeight. This is logicalHeight() before it is clamped to |
| 740 // min/max. | 741 // min/max. |
| 741 mutable LayoutUnit m_intrinsicContentLogicalHeight; | 742 mutable LayoutUnit m_intrinsicContentLogicalHeight; |
| 742 | 743 |
| 743 protected: | 744 protected: |
| 744 LayoutBoxExtent m_marginBox; | 745 LayoutBoxExtent m_marginBox; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 if (UNLIKELY(inlineBoxWrapper() != 0)) | 795 if (UNLIKELY(inlineBoxWrapper() != 0)) |
| 795 deleteLineBoxWrapper(); | 796 deleteLineBoxWrapper(); |
| 796 } | 797 } |
| 797 | 798 |
| 798 ensureRareData().m_inlineBoxWrapper = boxWrapper; | 799 ensureRareData().m_inlineBoxWrapper = boxWrapper; |
| 799 } | 800 } |
| 800 | 801 |
| 801 } // namespace blink | 802 } // namespace blink |
| 802 | 803 |
| 803 #endif // RenderBox_h | 804 #endif // RenderBox_h |
| OLD | NEW |