Chromium Code Reviews| 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 687 virtual void incrementallyInvalidatePaint(const LayoutLayerModelObject& pain tInvalidationContainer, const LayoutRect& oldBounds, const LayoutRect& newBounds , const LayoutPoint& positionFromPaintInvalidationContainer) override; | 687 virtual void incrementallyInvalidatePaint(const LayoutLayerModelObject& pain tInvalidationContainer, const LayoutRect& oldBounds, const LayoutRect& newBounds , const LayoutPoint& positionFromPaintInvalidationContainer) override; |
| 688 | 688 |
| 689 virtual void clearPaintInvalidationState(const PaintInvalidationState&) over ride; | 689 virtual void clearPaintInvalidationState(const PaintInvalidationState&) over ride; |
| 690 #if ENABLE(ASSERT) | 690 #if ENABLE(ASSERT) |
| 691 virtual bool paintInvalidationStateIsDirty() const override; | 691 virtual bool paintInvalidationStateIsDirty() const override; |
| 692 #endif | 692 #endif |
| 693 | 693 |
| 694 virtual PaintInvalidationReason invalidatePaintIfNeeded(const PaintInvalidat ionState&, const LayoutLayerModelObject& newPaintInvalidationContainer) override ; | 694 virtual PaintInvalidationReason invalidatePaintIfNeeded(const PaintInvalidat ionState&, const LayoutLayerModelObject& newPaintInvalidationContainer) override ; |
| 695 virtual void invalidateDisplayItemClients(DisplayItemList*) const override; | 695 virtual void invalidateDisplayItemClients(DisplayItemList*) const override; |
| 696 | 696 |
| 697 virtual bool hasNonCompositedScrollbars() const final; | |
|
dsinclair
2015/02/23 15:13:53
Should this be override instead of virtual?
mstensho (USE GERRIT)
2015/02/23 17:22:38
It's already a final override (there's a call site
| |
| 698 | |
| 697 private: | 699 private: |
| 698 void updateShapeOutsideInfoAfterStyleChange(const LayoutStyle&, const Layout Style* oldStyle); | 700 void updateShapeOutsideInfoAfterStyleChange(const LayoutStyle&, const Layout Style* oldStyle); |
| 699 void updateGridPositionAfterStyleChange(const LayoutStyle*); | 701 void updateGridPositionAfterStyleChange(const LayoutStyle*); |
| 700 | 702 |
| 701 bool autoWidthShouldFitContent() const; | 703 bool autoWidthShouldFitContent() const; |
| 702 LayoutUnit shrinkToFitLogicalWidth(LayoutUnit availableLogicalWidth, LayoutU nit bordersPlusPadding) const; | 704 LayoutUnit shrinkToFitLogicalWidth(LayoutUnit availableLogicalWidth, LayoutU nit bordersPlusPadding) const; |
| 703 | 705 |
| 704 // Returns true if we queued up a paint invalidation. | 706 // Returns true if we queued up a paint invalidation. |
| 705 bool paintInvalidationLayerRectsForImage(WrappedImagePtr, const FillLayer&, bool drawingBackground); | 707 bool paintInvalidationLayerRectsForImage(WrappedImagePtr, const FillLayer&, bool drawingBackground); |
| 706 | 708 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 749 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent). | 751 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent). |
| 750 LayoutRect m_frameRect; | 752 LayoutRect m_frameRect; |
| 751 | 753 |
| 752 // Our intrinsic height, used for min-height: min-content etc. Maintained by | 754 // Our intrinsic height, used for min-height: min-content etc. Maintained by |
| 753 // updateLogicalHeight. This is logicalHeight() before it is clamped to | 755 // updateLogicalHeight. This is logicalHeight() before it is clamped to |
| 754 // min/max. | 756 // min/max. |
| 755 mutable LayoutUnit m_intrinsicContentLogicalHeight; | 757 mutable LayoutUnit m_intrinsicContentLogicalHeight; |
| 756 | 758 |
| 757 void inflatePaintInvalidationRectForReflectionAndFilter(LayoutRect&) const; | 759 void inflatePaintInvalidationRectForReflectionAndFilter(LayoutRect&) const; |
| 758 | 760 |
| 759 bool hasNonCompositedScrollbars() const; | |
| 760 | |
| 761 LayoutRectOutsets m_marginBoxOutsets; | 761 LayoutRectOutsets m_marginBoxOutsets; |
| 762 | 762 |
| 763 protected: | 763 protected: |
| 764 // The preferred logical width of the element if it were to break its lines at every possible opportunity. | 764 // The preferred logical width of the element if it were to break its lines at every possible opportunity. |
| 765 LayoutUnit m_minPreferredLogicalWidth; | 765 LayoutUnit m_minPreferredLogicalWidth; |
| 766 | 766 |
| 767 // The preferred logical width of the element if it never breaks any lines a t all. | 767 // The preferred logical width of the element if it never breaks any lines a t all. |
| 768 LayoutUnit m_maxPreferredLogicalWidth; | 768 LayoutUnit m_maxPreferredLogicalWidth; |
| 769 | 769 |
| 770 // Our overflow information. | 770 // Our overflow information. |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 843 if (UNLIKELY(inlineBoxWrapper() != 0)) | 843 if (UNLIKELY(inlineBoxWrapper() != 0)) |
| 844 deleteLineBoxWrapper(); | 844 deleteLineBoxWrapper(); |
| 845 } | 845 } |
| 846 | 846 |
| 847 ensureRareData().m_inlineBoxWrapper = boxWrapper; | 847 ensureRareData().m_inlineBoxWrapper = boxWrapper; |
| 848 } | 848 } |
| 849 | 849 |
| 850 } // namespace blink | 850 } // namespace blink |
| 851 | 851 |
| 852 #endif // RenderBox_h | 852 #endif // RenderBox_h |
| OLD | NEW |