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

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

Issue 360613003: Ensure we compute the min and max height of replaced elements to 'none' or 0 when appropriate. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 6 years, 5 months 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDi rty(); } 709 virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDi rty(); }
710 710
711 RenderBoxRareData& ensureRareData() 711 RenderBoxRareData& ensureRareData()
712 { 712 {
713 if (!m_rareData) 713 if (!m_rareData)
714 m_rareData = adoptPtr(new RenderBoxRareData()); 714 m_rareData = adoptPtr(new RenderBoxRareData());
715 return *m_rareData.get(); 715 return *m_rareData.get();
716 } 716 }
717 717
718 void savePreviousBorderBoxSizeIfNeeded(); 718 void savePreviousBorderBoxSizeIfNeeded();
719 bool logicalHeightComputesAsNone(SizeType) const;
719 720
720 private: 721 private:
721 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent). 722 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent).
722 LayoutRect m_frameRect; 723 LayoutRect m_frameRect;
723 724
724 // Our intrinsic height, used for min-height: min-content etc. Maintained by 725 // Our intrinsic height, used for min-height: min-content etc. Maintained by
725 // updateLogicalHeight. This is logicalHeight() before it is clamped to 726 // updateLogicalHeight. This is logicalHeight() before it is clamped to
726 // min/max. 727 // min/max.
727 mutable LayoutUnit m_intrinsicContentLogicalHeight; 728 mutable LayoutUnit m_intrinsicContentLogicalHeight;
728 729
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 if (UNLIKELY(inlineBoxWrapper() != 0)) 781 if (UNLIKELY(inlineBoxWrapper() != 0))
781 deleteLineBoxWrapper(); 782 deleteLineBoxWrapper();
782 } 783 }
783 784
784 ensureRareData().m_inlineBoxWrapper = boxWrapper; 785 ensureRareData().m_inlineBoxWrapper = boxWrapper;
785 } 786 }
786 787
787 } // namespace WebCore 788 } // namespace WebCore
788 789
789 #endif // RenderBox_h 790 #endif // RenderBox_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/replaced/min-height-percentage-quirks-expected.html ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698