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

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 2741 matching lines...) Expand 10 before | Expand all | Expand 10 after
2752 case ExtendToZoom: 2752 case ExtendToZoom:
2753 case DeviceWidth: 2753 case DeviceWidth:
2754 case DeviceHeight: 2754 case DeviceHeight:
2755 break; 2755 break;
2756 } 2756 }
2757 2757
2758 ASSERT_NOT_REACHED(); 2758 ASSERT_NOT_REACHED();
2759 return LayoutUnit(); 2759 return LayoutUnit();
2760 } 2760 }
2761 2761
2762 LayoutUnit LayoutBox::computeReplacedLogicalHeight() const 2762 LayoutUnit LayoutBox::computeReplacedLogicalHeight(LayoutUnit) const
2763 { 2763 {
2764 return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLog icalHeightUsing(MainOrPreferredSize, style()->logicalHeight())); 2764 return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLog icalHeightUsing(MainOrPreferredSize, style()->logicalHeight()));
2765 } 2765 }
2766 2766
2767 bool LayoutBox::logicalHeightComputesAsNone(SizeType sizeType) const 2767 bool LayoutBox::logicalHeightComputesAsNone(SizeType sizeType) const
2768 { 2768 {
2769 ASSERT(sizeType == MinSize || sizeType == MaxSize); 2769 ASSERT(sizeType == MinSize || sizeType == MaxSize);
2770 Length logicalHeight = sizeType == MinSize ? style()->logicalMinHeight() : s tyle()->logicalMaxHeight(); 2770 Length logicalHeight = sizeType == MinSize ? style()->logicalMinHeight() : s tyle()->logicalMaxHeight();
2771 Length initialLogicalHeight = sizeType == MinSize ? ComputedStyle::initialMi nSize() : ComputedStyle::initialMaxSize(); 2771 Length initialLogicalHeight = sizeType == MinSize ? ComputedStyle::initialMi nSize() : ComputedStyle::initialMaxSize();
2772 2772
(...skipping 1930 matching lines...) Expand 10 before | Expand all | Expand 10 after
4703 4703
4704 void LayoutBox::clearPercentHeightDescendants() 4704 void LayoutBox::clearPercentHeightDescendants()
4705 { 4705 {
4706 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) { 4706 for (LayoutObject* curr = slowFirstChild(); curr; curr = curr->nextInPreOrde r(this)) {
4707 if (curr->isBox()) 4707 if (curr->isBox())
4708 toLayoutBox(curr)->removeFromPercentHeightContainer(); 4708 toLayoutBox(curr)->removeFromPercentHeightContainer();
4709 } 4709 }
4710 } 4710 }
4711 4711
4712 } // namespace blink 4712 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698