Source/core/rendering/RenderBlockFlow.h - Issue 296413007: [New Multicolumn] Add support for column-span:all

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

Issue 296413007: [New Multicolumn] Add support for column-span:all (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@359976

Patch Set: code review Created 6 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 | « Source/core/core.gypi ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

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-2013 Apple Inc. All rights reserved.	5 * Copyright (C) 2003-2013 Apple Inc. All rights reserved.

6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

7 * Copyright (C) 2013 Google Inc. All rights reserved.	7 * Copyright (C) 2013 Google Inc. All rights reserved.

8 *	8 *

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

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

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102	102

103 void markAllDescendantsWithFloatsForLayout(RenderBox* floatToRemove = 0, boo l inLayout = true);	103 void markAllDescendantsWithFloatsForLayout(RenderBox* floatToRemove = 0, boo l inLayout = true);

104 void markSiblingsWithFloatsForLayout(RenderBox* floatToRemove = 0);	104 void markSiblingsWithFloatsForLayout(RenderBox* floatToRemove = 0);

105	105

106 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects ->set().isEmpty(); }	106 bool containsFloats() const { return m_floatingObjects && !m_floatingObjects ->set().isEmpty(); }

107 bool containsFloat(RenderBox*) const;	107 bool containsFloat(RenderBox*) const;

108	108

109 void removeFloatingObjects();	109 void removeFloatingObjects();

110	110

111 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;	111 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;

	112 virtual void removeChild(RenderObject* oldChild) OVERRIDE;

112	113

113 void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveI nsert);	114 void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveI nsert);

114	115

115 bool generatesLineBoxesForInlineChild(RenderObject*);	116 bool generatesLineBoxesForInlineChild(RenderObject*);

116	117

117 LayoutUnit logicalTopForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->y() : floatingObject->x(); }	118 LayoutUnit logicalTopForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->y() : floatingObject->x(); }

118 LayoutUnit logicalBottomForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->maxY() : floatingObject->m axX(); }	119 LayoutUnit logicalBottomForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->maxY() : floatingObject->m axX(); }

119 LayoutUnit logicalLeftForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->x() : floatingObject->y(); }	120 LayoutUnit logicalLeftForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->x() : floatingObject->y(); }

120 LayoutUnit logicalRightForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->maxX() : floatingObject->ma xY(); }	121 LayoutUnit logicalRightForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->maxX() : floatingObject->ma xY(); }

121 LayoutUnit logicalWidthForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->width() : floatingObject->h eight(); }	122 LayoutUnit logicalWidthForFloat(const FloatingObject* floatingObject) const { return isHorizontalWritingMode() ? floatingObject->width() : floatingObject->h eight(); }

(...skipping 376 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
498	499

499 // END METHODS DEFINED IN RenderBlockLineLayout	500 // END METHODS DEFINED IN RenderBlockLineLayout

500	501

501 };	502 };

502	503

503 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());	504 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBlockFlow, isRenderBlockFlow());

504	505

505 } // namespace blink	506 } // namespace blink

506	507

507 #endif // RenderBlockFlow_h	508 #endif // RenderBlockFlow_h

OLD	NEW