Source/core/rendering/RenderMultiColumnFlowThread.h - Issue 209863003: [New Multicolumn] balancer confused by content with top margins.

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

Issue 209863003: [New Multicolumn] balancer confused by content with top margins. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix test failures in debug mode. Created 6 years, 9 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 | « Source/core/rendering/RenderFlowThread.h ('k') | Source/core/rendering/RenderMultiColumnFlowThread.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2012 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 private:	51 private:

52 RenderMultiColumnFlowThread();	52 RenderMultiColumnFlowThread();

53	53

54 virtual const char* renderName() const OVERRIDE;	54 virtual const char* renderName() const OVERRIDE;

55 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;	55 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;

56 virtual void autoGenerateRegionsToBlockOffset(LayoutUnit) OVERRIDE;	56 virtual void autoGenerateRegionsToBlockOffset(LayoutUnit) OVERRIDE;

57 virtual LayoutUnit initialLogicalWidth() const OVERRIDE;	57 virtual LayoutUnit initialLogicalWidth() const OVERRIDE;

58 virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) OVERR IDE;	58 virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) OVERR IDE;

59 virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight ) OVERRIDE;	59 virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight ) OVERRIDE;

60 virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) OVERRIDE;	60 virtual bool addForcedRegionBreak(LayoutUnit, RenderObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) OVERRIDE;

	61 virtual bool isPageLogicalHeightKnown() const OVERRIDE;

61	62

62 unsigned m_columnCount; // The used value of column-count	63 unsigned m_columnCount; // The used value of column-count

63 LayoutUnit m_columnWidth; // The used value of column-width	64 LayoutUnit m_columnWidth; // The used value of column-width

64 LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.	65 LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.

65 bool m_inBalancingPass; // Set when relayouting for column balancing.	66 bool m_inBalancingPass; // Set when relayouting for column balancing.

66 bool m_needsRebalancing;	67 bool m_needsRebalancing;

67 };	68 };

68	69

69 } // namespace WebCore	70 } // namespace WebCore

70	71

71 #endif // RenderMultiColumnFlowThread_h	72 #endif // RenderMultiColumnFlowThread_h

72	73

OLD	NEW