Source/WebCore/rendering/RenderBlock.h - Issue 10756009: Merge 120862

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

Issue 10756009: Merge 120862 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 5 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:

« no previous file with comments | « LayoutTests/fast/block/percent-height-descendant-not-removed-crash2-expected.txt ('k') | Source/WebCore/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 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
101 void insertPositionedObject(RenderBox*);	101 void insertPositionedObject(RenderBox*);

102 void removePositionedObject(RenderBox*);	102 void removePositionedObject(RenderBox*);

103 void removePositionedObjects(RenderBlock*);	103 void removePositionedObjects(RenderBlock*);

104	104

105 typedef ListHashSet<RenderBox*, 4> PositionedObjectsListHashSet;	105 typedef ListHashSet<RenderBox*, 4> PositionedObjectsListHashSet;

106 PositionedObjectsListHashSet* positionedObjects() const { return m_positione dObjects.get(); }	106 PositionedObjectsListHashSet* positionedObjects() const { return m_positione dObjects.get(); }

107	107

108 void addPercentHeightDescendant(RenderBox*);	108 void addPercentHeightDescendant(RenderBox*);

109 static void removePercentHeightDescendant(RenderBox*);	109 static void removePercentHeightDescendant(RenderBox*);

110 HashSet<RenderBox> percentHeightDescendants() const;	110 HashSet<RenderBox> percentHeightDescendants() const;

111 #if !ASSERT_DISABLED	111 static bool hasPercentHeightContainerMap();

112 static bool hasPercentHeightDescendant(RenderBox*);	112 static bool hasPercentHeightDescendant(RenderBox*);

113 #endif	113 static void clearPercentHeightDescendantsFrom(RenderBox*);

	114 static void removePercentHeightDescendantIfNeeded(RenderBox*);

114	115

115 void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; }	116 void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; }

116 bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }	117 bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }

117	118

118 RootInlineBox* createAndAppendRootInlineBox();	119 RootInlineBox* createAndAppendRootInlineBox();

119	120

120 bool generatesLineBoxesForInlineChild(RenderObject*);	121 bool generatesLineBoxesForInlineChild(RenderObject*);

121	122

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

123 void markSiblingsWithFloatsForLayout(RenderBox* floatToRemove = 0);	124 void markSiblingsWithFloatsForLayout(RenderBox* floatToRemove = 0);

(...skipping 1014 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1138 static String string(const int value);	1139 static String string(const int value);

1139 };	1140 };

1140 template<> struct ValueToString<RenderBlock::FloatingObject*> {	1141 template<> struct ValueToString<RenderBlock::FloatingObject*> {

1141 static String string(const RenderBlock::FloatingObject*);	1142 static String string(const RenderBlock::FloatingObject*);

1142 };	1143 };

1143 #endif	1144 #endif

1144	1145

1145 } // namespace WebCore	1146 } // namespace WebCore

1146	1147

1147 #endif // RenderBlock_h	1148 #endif // RenderBlock_h

OLD	NEW