| 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 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild); | 672 RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild); |
| 673 | 673 |
| 674 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur
rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container
Rect) const OVERRIDE; | 674 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur
rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container
Rect) const OVERRIDE; |
| 675 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint&
layerOffset) const OVERRIDE; | 675 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint&
layerOffset) const OVERRIDE; |
| 676 | 676 |
| 677 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH
eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight;
} | 677 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH
eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight;
} |
| 678 | 678 |
| 679 virtual InvalidationReason getPaintInvalidationReason(const RenderLayerModel
Object& paintInvalidationContainer, | 679 virtual InvalidationReason getPaintInvalidationReason(const RenderLayerModel
Object& paintInvalidationContainer, |
| 680 const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInva
lidationContainer, | 680 const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInva
lidationContainer, |
| 681 const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInva
lidationContainer) OVERRIDE; | 681 const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInva
lidationContainer) OVERRIDE; |
| 682 virtual void incrementallyInvalidatePaint(const RenderLayerModelObject& pain
tInvalidationContainer, const LayoutRect& oldBounds, const LayoutRect& newBounds
, const LayoutPoint& positionFromPaintInvalidationContainer) OVERRIDE; |
| 682 | 683 |
| 683 virtual void clearPaintInvalidationState(const PaintInvalidationState&) OVER
RIDE; | 684 virtual void clearPaintInvalidationState(const PaintInvalidationState&) OVER
RIDE; |
| 684 #if ENABLE(ASSERT) | 685 #if ENABLE(ASSERT) |
| 685 virtual bool paintInvalidationStateIsDirty() const OVERRIDE; | 686 virtual bool paintInvalidationStateIsDirty() const OVERRIDE; |
| 686 #endif | 687 #endif |
| 687 | 688 |
| 688 private: | 689 private: |
| 689 void updateShapeOutsideInfoAfterStyleChange(const RenderStyle&, const Render
Style* oldStyle); | 690 void updateShapeOutsideInfoAfterStyleChange(const RenderStyle&, const Render
Style* oldStyle); |
| 690 void updateGridPositionAfterStyleChange(const RenderStyle*); | 691 void updateGridPositionAfterStyleChange(const RenderStyle*); |
| 691 | 692 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDi
rty(); } | 725 virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDi
rty(); } |
| 725 | 726 |
| 726 RenderBoxRareData& ensureRareData() | 727 RenderBoxRareData& ensureRareData() |
| 727 { | 728 { |
| 728 if (!m_rareData) | 729 if (!m_rareData) |
| 729 m_rareData = adoptPtr(new RenderBoxRareData()); | 730 m_rareData = adoptPtr(new RenderBoxRareData()); |
| 730 return *m_rareData.get(); | 731 return *m_rareData.get(); |
| 731 } | 732 } |
| 732 | 733 |
| 733 void savePreviousBorderBoxSizeIfNeeded(); | 734 void savePreviousBorderBoxSizeIfNeeded(); |
| 735 LayoutSize computePreviousBorderBoxSize(const LayoutSize& previousBoundsSize
) const; |
| 736 |
| 734 bool logicalHeightComputesAsNone(SizeType) const; | 737 bool logicalHeightComputesAsNone(SizeType) const; |
| 735 | 738 |
| 736 virtual InvalidationReason invalidatePaintIfNeeded(const PaintInvalidationSt
ate&, const RenderLayerModelObject& newPaintInvalidationContainer) OVERRIDE FINA
L; | 739 virtual InvalidationReason invalidatePaintIfNeeded(const PaintInvalidationSt
ate&, const RenderLayerModelObject& newPaintInvalidationContainer) OVERRIDE FINA
L; |
| 737 | 740 |
| 738 bool isBox() const WTF_DELETED_FUNCTION; // This will catch anyone doing an
unnecessary check. | 741 bool isBox() const WTF_DELETED_FUNCTION; // This will catch anyone doing an
unnecessary check. |
| 739 | 742 |
| 740 // The width/height of the contents + borders + padding. The x/y location i
s relative to our container (which is not always our parent). | 743 // The width/height of the contents + borders + padding. The x/y location i
s relative to our container (which is not always our parent). |
| 741 LayoutRect m_frameRect; | 744 LayoutRect m_frameRect; |
| 742 | 745 |
| 743 // Our intrinsic height, used for min-height: min-content etc. Maintained by | 746 // Our intrinsic height, used for min-height: min-content etc. Maintained by |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 799 if (UNLIKELY(inlineBoxWrapper() != 0)) | 802 if (UNLIKELY(inlineBoxWrapper() != 0)) |
| 800 deleteLineBoxWrapper(); | 803 deleteLineBoxWrapper(); |
| 801 } | 804 } |
| 802 | 805 |
| 803 ensureRareData().m_inlineBoxWrapper = boxWrapper; | 806 ensureRareData().m_inlineBoxWrapper = boxWrapper; |
| 804 } | 807 } |
| 805 | 808 |
| 806 } // namespace blink | 809 } // namespace blink |
| 807 | 810 |
| 808 #endif // RenderBox_h | 811 #endif // RenderBox_h |
| OLD | NEW |