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

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 per Commetns 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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 // These include tables, positioned objects, floats and flexible boxes. 706 // These include tables, positioned objects, floats and flexible boxes.
707 virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDi rty(); } 707 virtual void computePreferredLogicalWidths() { clearPreferredLogicalWidthsDi rty(); }
708 708
709 RenderBoxRareData& ensureRareData() 709 RenderBoxRareData& ensureRareData()
710 { 710 {
711 if (!m_rareData) 711 if (!m_rareData)
712 m_rareData = adoptPtr(new RenderBoxRareData()); 712 m_rareData = adoptPtr(new RenderBoxRareData());
713 return *m_rareData.get(); 713 return *m_rareData.get();
714 } 714 }
715 715
716 bool logicalHeightComputesAsNone(SizeType) const;
717
716 private: 718 private:
717 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent). 719 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent).
718 LayoutRect m_frameRect; 720 LayoutRect m_frameRect;
719 721
720 // Our intrinsic height, used for min-height: min-content etc. Maintained by 722 // Our intrinsic height, used for min-height: min-content etc. Maintained by
721 // updateLogicalHeight. This is logicalHeight() before it is clamped to 723 // updateLogicalHeight. This is logicalHeight() before it is clamped to
722 // min/max. 724 // min/max.
723 mutable LayoutUnit m_intrinsicContentLogicalHeight; 725 mutable LayoutUnit m_intrinsicContentLogicalHeight;
724 726
725 protected: 727 protected:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 if (UNLIKELY(inlineBoxWrapper() != 0)) 778 if (UNLIKELY(inlineBoxWrapper() != 0))
777 deleteLineBoxWrapper(); 779 deleteLineBoxWrapper();
778 } 780 }
779 781
780 ensureRareData().m_inlineBoxWrapper = boxWrapper; 782 ensureRareData().m_inlineBoxWrapper = boxWrapper;
781 } 783 }
782 784
783 } // namespace WebCore 785 } // namespace WebCore
784 786
785 #endif // RenderBox_h 787 #endif // RenderBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698