Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Side by Side Diff: Source/core/rendering/RenderBox.h

Issue 715083002: Avoid blowing away the intrinsicContentLogicalHeight when stretching height in FlexBox (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: s/EAE likes/I like/ Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 } 636 }
637 637
638 void markShapeOutsideDependentsForLayout() 638 void markShapeOutsideDependentsForLayout()
639 { 639 {
640 if (isFloating()) 640 if (isFloating())
641 removeFloatingOrPositionedChildFromBlockLists(); 641 removeFloatingOrPositionedChildFromBlockLists();
642 } 642 }
643 643
644 bool backgroundHasOpaqueTopLayer() const; 644 bool backgroundHasOpaqueTopLayer() const;
645 645
646 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
646 protected: 647 protected:
647 virtual void willBeDestroyed() override; 648 virtual void willBeDestroyed() override;
648 649
649 650
650 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride; 651 virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) o verride;
651 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride; 652 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
652 virtual void updateFromStyle() override; 653 virtual void updateFromStyle() override;
653 654
654 // Returns false if it could not cheaply compute the extent (e.g. fixed back ground), in which case the returned rect may be incorrect. 655 // Returns false if it could not cheaply compute the extent (e.g. fixed back ground), in which case the returned rect may be incorrect.
655 // FIXME: make this a const method once the RenderBox reference in BoxPainte r is const. 656 // FIXME: make this a const method once the RenderBox reference in BoxPainte r is const.
656 bool getBackgroundPaintedExtent(LayoutRect&); 657 bool getBackgroundPaintedExtent(LayoutRect&);
657 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const; 658 virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const;
658 virtual bool computeBackgroundIsKnownToBeObscured() override; 659 virtual bool computeBackgroundIsKnownToBeObscured() override;
659 660
660 void computePositionedLogicalWidth(LogicalExtentComputedValues&) const; 661 void computePositionedLogicalWidth(LogicalExtentComputedValues&) const;
661 662
662 LayoutUnit computeIntrinsicLogicalWidthUsing(const Length& logicalWidthLengt h, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const; 663 LayoutUnit computeIntrinsicLogicalWidthUsing(const Length& logicalWidthLengt h, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
663 LayoutUnit computeIntrinsicLogicalContentHeightUsing(const Length& logicalHe ightLength, LayoutUnit intrinsicContentHeight, LayoutUnit borderAndPadding) cons t; 664 LayoutUnit computeIntrinsicLogicalContentHeightUsing(const Length& logicalHe ightLength, LayoutUnit intrinsicContentHeight, LayoutUnit borderAndPadding) cons t;
664 665
665 virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !i sInlineBlockOrInlineTable(); } 666 virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !i sInlineBlockOrInlineTable(); }
666 667
667 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override; 668 virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalida tionContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override;
668 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst override; 669 virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) c onst override;
669 670
670 RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild); 671 RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
671 672
672 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const override; 673 virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* cur rentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& container Rect) const override;
673 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override; 674 virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
674 675
675 void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalH eight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
676
677 virtual PaintInvalidationReason paintInvalidationReason(const RenderLayerMod elObject& paintInvalidationContainer, 676 virtual PaintInvalidationReason paintInvalidationReason(const RenderLayerMod elObject& paintInvalidationContainer,
678 const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInva lidationContainer, 677 const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInva lidationContainer,
679 const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInva lidationContainer) const override; 678 const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInva lidationContainer) const override;
680 virtual void incrementallyInvalidatePaint(const RenderLayerModelObject& pain tInvalidationContainer, const LayoutRect& oldBounds, const LayoutRect& newBounds , const LayoutPoint& positionFromPaintInvalidationContainer) override; 679 virtual void incrementallyInvalidatePaint(const RenderLayerModelObject& pain tInvalidationContainer, const LayoutRect& oldBounds, const LayoutRect& newBounds , const LayoutPoint& positionFromPaintInvalidationContainer) override;
681 680
682 virtual void clearPaintInvalidationState(const PaintInvalidationState&) over ride; 681 virtual void clearPaintInvalidationState(const PaintInvalidationState&) over ride;
683 #if ENABLE(ASSERT) 682 #if ENABLE(ASSERT)
684 virtual bool paintInvalidationStateIsDirty() const override; 683 virtual bool paintInvalidationStateIsDirty() const override;
685 #endif 684 #endif
686 685
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 if (UNLIKELY(inlineBoxWrapper() != 0)) 803 if (UNLIKELY(inlineBoxWrapper() != 0))
805 deleteLineBoxWrapper(); 804 deleteLineBoxWrapper();
806 } 805 }
807 806
808 ensureRareData().m_inlineBoxWrapper = boxWrapper; 807 ensureRareData().m_inlineBoxWrapper = boxWrapper;
809 } 808 }
810 809
811 } // namespace blink 810 } // namespace blink
812 811
813 #endif // RenderBox_h 812 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/flexbox/relayout-stretched-flexbox-expected.txt ('k') | Source/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698