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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 1868013002: Percent height in auto height containers no longer computes as auto (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@303728-6
Patch Set: Updated Created 4 years, 8 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
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 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2779 matching lines...) Expand 10 before | Expand all | Expand 10 after
2790 case ExtendToZoom: 2790 case ExtendToZoom:
2791 case DeviceWidth: 2791 case DeviceWidth:
2792 case DeviceHeight: 2792 case DeviceHeight:
2793 break; 2793 break;
2794 } 2794 }
2795 2795
2796 ASSERT_NOT_REACHED(); 2796 ASSERT_NOT_REACHED();
2797 return LayoutUnit(); 2797 return LayoutUnit();
2798 } 2798 }
2799 2799
2800 LayoutUnit LayoutBox::computeReplacedLogicalHeight() const 2800 LayoutUnit LayoutBox::computeReplacedLogicalHeight(LayoutUnit) const
2801 { 2801 {
2802 return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLog icalHeightUsing(MainOrPreferredSize, style()->logicalHeight())); 2802 return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLog icalHeightUsing(MainOrPreferredSize, style()->logicalHeight()));
2803 } 2803 }
2804 2804
2805 bool LayoutBox::logicalHeightComputesAsNone(SizeType sizeType) const 2805 bool LayoutBox::logicalHeightComputesAsNone(SizeType sizeType) const
2806 { 2806 {
2807 ASSERT(sizeType == MinSize || sizeType == MaxSize); 2807 ASSERT(sizeType == MinSize || sizeType == MaxSize);
2808 Length logicalHeight = sizeType == MinSize ? style()->logicalMinHeight() : s tyle()->logicalMaxHeight(); 2808 Length logicalHeight = sizeType == MinSize ? style()->logicalMinHeight() : s tyle()->logicalMaxHeight();
2809 Length initialLogicalHeight = sizeType == MinSize ? ComputedStyle::initialMi nSize() : ComputedStyle::initialMaxSize(); 2809 Length initialLogicalHeight = sizeType == MinSize ? ComputedStyle::initialMi nSize() : ComputedStyle::initialMaxSize();
2810 2810
(...skipping 1926 matching lines...) Expand 10 before | Expand all | Expand 10 after
4737 4737
4738 void LayoutBox::clearPercentHeightDescendants() 4738 void LayoutBox::clearPercentHeightDescendants()
4739 { 4739 {
4740 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) { 4740 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) {
4741 if (curr->isBox()) 4741 if (curr->isBox())
4742 toLayoutBox(curr)->removeFromPercentHeightContainer(); 4742 toLayoutBox(curr)->removeFromPercentHeightContainer();
4743 } 4743 }
4744 } 4744 }
4745 4745
4746 } // namespace blink 4746 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698