Source/core/rendering/RenderBlock.h - Issue 23763002: Improve multicol preferred/intrinsic width calculation.

Side by Side Diff: Source/core/rendering/RenderBlock.h

Issue 23763002: Improve multicol preferred/intrinsic width calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Code review Created 7 years, 3 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

« no previous file with comments | « LayoutTests/platform/win/fast/multicol/positioned-with-constrained-height-expected.txt ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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) 2007 David Smith (catfish.man@gmail.com)	4 * (C) 2007 David Smith (catfish.man@gmail.com)

5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.	5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.

6 *	6 *

7 * This library is free software; you can redistribute it and/or	7 * This library is free software; you can redistribute it and/or

8 * modify it under the terms of the GNU Library General Public	8 * modify it under the terms of the GNU Library General Public

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 505 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
516 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi calTop, fixedOffset, heightRemaining, logicalHeight, ShapeOutsideFloatMarginBoxO ffset), applyTextIndent);	516 return adjustLogicalLeftOffsetForLine(logicalLeftFloatOffsetForLine(logi calTop, fixedOffset, heightRemaining, logicalHeight, ShapeOutsideFloatMarginBoxO ffset), applyTextIndent);

517 }	517 }

518	518

519 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;	519 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const;

520 virtual void adjustInlineDirectionLineBounds(int /* expansionOpportunityCoun t /, float& / logicalLeft /, float& / logicalWidth */) const { }	520 virtual void adjustInlineDirectionLineBounds(int /* expansionOpportunityCoun t /, float& / logicalLeft /, float& / logicalWidth */) const { }

521	521

522 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;	522 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAct ion) OVERRIDE;

523	523

524 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;	524 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;

525 virtual void computePreferredLogicalWidths() OVERRIDE;	525 virtual void computePreferredLogicalWidths() OVERRIDE;

	526 void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const;

526	527

527 virtual int firstLineBoxBaseline() const;	528 virtual int firstLineBoxBaseline() const;

528 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;	529 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;

529 int lastLineBoxBaseline(LineDirectionMode) const;	530 int lastLineBoxBaseline(LineDirectionMode) const;

530	531

531 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);	532 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);

532	533

533 // Delay update scrollbar until finishDelayRepaint() will be	534 // Delay update scrollbar until finishDelayRepaint() will be

534 // called. This function is used when a flexbox is laying out its	535 // called. This function is used when a flexbox is laying out its

535 // descendant. If multiple calls are made to startDelayRepaint(),	536 // descendant. If multiple calls are made to startDelayRepaint(),

(...skipping 558 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1094 ASSERT_WITH_SECURITY_IMPLICATION(!object \|\| object->isRenderBlock());	1095 ASSERT_WITH_SECURITY_IMPLICATION(!object \|\| object->isRenderBlock());

1095 return static_cast<const RenderBlock*>(object);	1096 return static_cast<const RenderBlock*>(object);

1096 }	1097 }

1097	1098

1098 // This will catch anyone doing an unnecessary cast.	1099 // This will catch anyone doing an unnecessary cast.

1099 void toRenderBlock(const RenderBlock*);	1100 void toRenderBlock(const RenderBlock*);

1100	1101

1101 } // namespace WebCore	1102 } // namespace WebCore

1102	1103

1103 #endif // RenderBlock_h	1104 #endif // RenderBlock_h

OLD	NEW