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

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

Issue 1295933003: Add overflow:auto scrollbars to child flex basis. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add all tests, even failing ones Created 5 years, 4 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 * (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 2366 matching lines...) Expand 10 before | Expand all | Expand 10 after
2377 2377
2378 LayoutUnit LayoutBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heig htType, const Length& height, LayoutUnit intrinsicContentHeight) const 2378 LayoutUnit LayoutBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heig htType, const Length& height, LayoutUnit intrinsicContentHeight) const
2379 { 2379 {
2380 if (height.isAuto()) 2380 if (height.isAuto())
2381 return heightType == MinSize ? 0 : -1; 2381 return heightType == MinSize ? 0 : -1;
2382 // FIXME(cbiesinger): The css-sizing spec is considering changing what min-c ontent/max-content should resolve to. 2382 // FIXME(cbiesinger): The css-sizing spec is considering changing what min-c ontent/max-content should resolve to.
2383 // If that happens, this code will have to change. 2383 // If that happens, this code will have to change.
2384 if (height.isIntrinsic()) { 2384 if (height.isIntrinsic()) {
2385 if (intrinsicContentHeight == -1) 2385 if (intrinsicContentHeight == -1)
2386 return -1; // Intrinsic height isn't available. 2386 return -1; // Intrinsic height isn't available.
2387 return computeIntrinsicLogicalContentHeightUsing(height, intrinsicConten tHeight, borderAndPaddingLogicalHeight()); 2387 return computeIntrinsicLogicalContentHeightUsing(height, intrinsicConten tHeight, borderAndPaddingLogicalHeight()) + scrollbarLogicalHeight();
2388 } 2388 }
2389 if (height.isFixed()) 2389 if (height.isFixed())
2390 return height.value(); 2390 return height.value();
2391 if (height.hasPercent()) 2391 if (height.hasPercent())
2392 return computePercentageLogicalHeight(height); 2392 return computePercentageLogicalHeight(height);
2393 return -1; 2393 return -1;
2394 } 2394 }
2395 2395
2396 bool LayoutBox::skipContainingBlockForPercentHeightCalculation(const LayoutBox* containingBlock) const 2396 bool LayoutBox::skipContainingBlockForPercentHeightCalculation(const LayoutBox* containingBlock) const
2397 { 2397 {
(...skipping 2336 matching lines...) Expand 10 before | Expand all | Expand 10 after
4734 StyleImage* borderImage = style()->borderImage().image(); 4734 StyleImage* borderImage = style()->borderImage().image();
4735 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded(); 4735 return borderImage && borderImage->canRender(*this, style()->effectiveZoom() ) && borderImage->isLoaded();
4736 } 4736 }
4737 4737
4738 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const 4738 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const
4739 { 4739 {
4740 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr; 4740 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this) : nullptr;
4741 } 4741 }
4742 4742
4743 } // namespace blink 4743 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698