Source/WebCore/rendering/RenderBlock.h - Issue 10729003: Merge 121001

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

Issue 10729003: Merge 121001 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

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:

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 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 virtual void removeChild(RenderObject*);	97 virtual void removeChild(RenderObject*);

98	98

99 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);	99 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);

100	100

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 bool hasPositionedObjects() const { return m_positionedObjects && !m_positio nedObjects->isEmpty(); }

107	108

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

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

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

111 static bool hasPercentHeightContainerMap();	112 static bool hasPercentHeightContainerMap();

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

113 static void clearPercentHeightDescendantsFrom(RenderBox*);	114 static void clearPercentHeightDescendantsFrom(RenderBox*);

114 static void removePercentHeightDescendantIfNeeded(RenderBox*);	115 static void removePercentHeightDescendantIfNeeded(RenderBox*);

115	116

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

(...skipping 1026 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1143 static String string(const int value);	1144 static String string(const int value);

1144 };	1145 };

1145 template<> struct ValueToString<RenderBlock::FloatingObject*> {	1146 template<> struct ValueToString<RenderBlock::FloatingObject*> {

1146 static String string(const RenderBlock::FloatingObject*);	1147 static String string(const RenderBlock::FloatingObject*);

1147 };	1148 };

1148 #endif	1149 #endif

1149	1150

1150 } // namespace WebCore	1151 } // namespace WebCore

1151	1152

1152 #endif // RenderBlock_h	1153 #endif // RenderBlock_h

OLD	NEW