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

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: 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 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
703 703
704 virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE FINAL { re turn frameRect(); } 704 virtual LayoutRect frameRectForStickyPositioning() const OVERRIDE FINAL { re turn frameRect(); }
705 705
706 RenderBoxRareData& ensureRareData() 706 RenderBoxRareData& ensureRareData()
707 { 707 {
708 if (!m_rareData) 708 if (!m_rareData)
709 m_rareData = adoptPtr(new RenderBoxRareData()); 709 m_rareData = adoptPtr(new RenderBoxRareData());
710 return *m_rareData.get(); 710 return *m_rareData.get();
711 } 711 }
712 712
713 bool logicalHeightComputesAsNone(SizeType) const;
714
713 private: 715 private:
714 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent). 716 // The width/height of the contents + borders + padding. The x/y location i s relative to our container (which is not always our parent).
715 LayoutRect m_frameRect; 717 LayoutRect m_frameRect;
716 718
717 // Our intrinsic height, used for min-height: min-content etc. Maintained by 719 // Our intrinsic height, used for min-height: min-content etc. Maintained by
718 // updateLogicalHeight. This is logicalHeight() before it is clamped to 720 // updateLogicalHeight. This is logicalHeight() before it is clamped to
719 // min/max. 721 // min/max.
720 mutable LayoutUnit m_intrinsicContentLogicalHeight; 722 mutable LayoutUnit m_intrinsicContentLogicalHeight;
721 723
722 protected: 724 protected:
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 if (UNLIKELY(inlineBoxWrapper() != 0)) 775 if (UNLIKELY(inlineBoxWrapper() != 0))
774 deleteLineBoxWrapper(); 776 deleteLineBoxWrapper();
775 } 777 }
776 778
777 ensureRareData().m_inlineBoxWrapper = boxWrapper; 779 ensureRareData().m_inlineBoxWrapper = boxWrapper;
778 } 780 }
779 781
780 } // namespace WebCore 782 } // namespace WebCore
781 783
782 #endif // RenderBox_h 784 #endif // RenderBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698