Title: [155142] trunk/Source/WebCore
- Revision
- 155142
- Author
- [email protected]
- Date
- 2013-09-05 12:57:08 -0700 (Thu, 05 Sep 2013)
Log Message
Make RenderListItem inherit from RenderBlockFlow.
https://bugs.webkit.org/show_bug.cgi?id=120789
Reviewed by Beth Dakin.
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::RenderListItem):
(WebCore::RenderListItem::willBeDestroyed):
(WebCore::RenderListItem::willBeRemovedFromTree):
(WebCore::RenderListItem::layout):
(WebCore::RenderListItem::addOverflowFromChildren):
(WebCore::RenderListItem::computePreferredLogicalWidths):
(WebCore::RenderListItem::paint):
* rendering/RenderListItem.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (155141 => 155142)
--- trunk/Source/WebCore/ChangeLog 2013-09-05 19:47:40 UTC (rev 155141)
+++ trunk/Source/WebCore/ChangeLog 2013-09-05 19:57:08 UTC (rev 155142)
@@ -1,5 +1,22 @@
2013-09-05 David Hyatt <[email protected]>
+ Make RenderListItem inherit from RenderBlockFlow.
+ https://bugs.webkit.org/show_bug.cgi?id=120789
+
+ Reviewed by Beth Dakin.
+
+ * rendering/RenderListItem.cpp:
+ (WebCore::RenderListItem::RenderListItem):
+ (WebCore::RenderListItem::willBeDestroyed):
+ (WebCore::RenderListItem::willBeRemovedFromTree):
+ (WebCore::RenderListItem::layout):
+ (WebCore::RenderListItem::addOverflowFromChildren):
+ (WebCore::RenderListItem::computePreferredLogicalWidths):
+ (WebCore::RenderListItem::paint):
+ * rendering/RenderListItem.h:
+
+2013-09-05 David Hyatt <[email protected]>
+
Make RenderBlock have a protected constructor..
https://bugs.webkit.org/show_bug.cgi?id=120787
Modified: trunk/Source/WebCore/rendering/RenderListItem.cpp (155141 => 155142)
--- trunk/Source/WebCore/rendering/RenderListItem.cpp 2013-09-05 19:47:40 UTC (rev 155141)
+++ trunk/Source/WebCore/rendering/RenderListItem.cpp 2013-09-05 19:57:08 UTC (rev 155142)
@@ -42,7 +42,7 @@
using namespace HTMLNames;
RenderListItem::RenderListItem(Element* element)
- : RenderBlock(element)
+ : RenderBlockFlow(element)
, m_marker(0)
, m_hasExplicitValue(false)
, m_isValueUpToDate(false)
@@ -76,7 +76,7 @@
m_marker->destroy();
m_marker = 0;
}
- RenderBlock::willBeDestroyed();
+ RenderBlockFlow::willBeDestroyed();
}
void RenderListItem::insertedIntoTree()
@@ -88,7 +88,7 @@
void RenderListItem::willBeRemovedFromTree()
{
- RenderBlock::willBeRemovedFromTree();
+ RenderBlockFlow::willBeRemovedFromTree();
updateListMarkerNumbers();
}
@@ -306,12 +306,12 @@
ASSERT(needsLayout());
insertOrMoveMarkerRendererIfNeeded();
- RenderBlock::layout();
+ RenderBlockFlow::layout();
}
void RenderListItem::addOverflowFromChildren()
{
- RenderBlock::addOverflowFromChildren();
+ RenderBlockFlow::addOverflowFromChildren();
positionListMarker();
}
@@ -325,7 +325,7 @@
SetLayoutNeededForbiddenScope layoutForbiddenScope(this, false);
#endif
insertOrMoveMarkerRendererIfNeeded();
- RenderBlock::computePreferredLogicalWidths();
+ RenderBlockFlow::computePreferredLogicalWidths();
}
void RenderListItem::positionListMarker()
@@ -428,7 +428,7 @@
if (!logicalHeight() && hasOverflowClip())
return;
- RenderBlock::paint(paintInfo, paintOffset);
+ RenderBlockFlow::paint(paintInfo, paintOffset);
}
const String& RenderListItem::markerText() const
Modified: trunk/Source/WebCore/rendering/RenderListItem.h (155141 => 155142)
--- trunk/Source/WebCore/rendering/RenderListItem.h 2013-09-05 19:47:40 UTC (rev 155141)
+++ trunk/Source/WebCore/rendering/RenderListItem.h 2013-09-05 19:57:08 UTC (rev 155142)
@@ -23,14 +23,14 @@
#ifndef RenderListItem_h
#define RenderListItem_h
-#include "RenderBlock.h"
+#include "RenderBlockFlow.h"
namespace WebCore {
class HTMLOListElement;
class RenderListMarker;
-class RenderListItem FINAL : public RenderBlock {
+class RenderListItem FINAL : public RenderBlockFlow {
public:
explicit RenderListItem(Element*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
