Commit bda1e5b0 authored by hyatt@apple.com's avatar hyatt@apple.com

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:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155142 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 696e6441
2013-09-05 David Hyatt <hyatt@apple.com>
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 <hyatt@apple.com>
Make RenderBlock have a protected constructor..
......@@ -42,7 +42,7 @@ namespace WebCore {
using namespace HTMLNames;
RenderListItem::RenderListItem(Element* element)
: RenderBlock(element)
: RenderBlockFlow(element)
, m_marker(0)
, m_hasExplicitValue(false)
, m_isValueUpToDate(false)
......@@ -76,7 +76,7 @@ void RenderListItem::willBeDestroyed()
m_marker->destroy();
m_marker = 0;
}
RenderBlock::willBeDestroyed();
RenderBlockFlow::willBeDestroyed();
}
void RenderListItem::insertedIntoTree()
......@@ -88,7 +88,7 @@ void RenderListItem::insertedIntoTree()
void RenderListItem::willBeRemovedFromTree()
{
RenderBlock::willBeRemovedFromTree();
RenderBlockFlow::willBeRemovedFromTree();
updateListMarkerNumbers();
}
......@@ -306,12 +306,12 @@ void RenderListItem::layout()
ASSERT(needsLayout());
insertOrMoveMarkerRendererIfNeeded();
RenderBlock::layout();
RenderBlockFlow::layout();
}
void RenderListItem::addOverflowFromChildren()
{
RenderBlock::addOverflowFromChildren();
RenderBlockFlow::addOverflowFromChildren();
positionListMarker();
}
......@@ -325,7 +325,7 @@ void RenderListItem::computePreferredLogicalWidths()
SetLayoutNeededForbiddenScope layoutForbiddenScope(this, false);
#endif
insertOrMoveMarkerRendererIfNeeded();
RenderBlock::computePreferredLogicalWidths();
RenderBlockFlow::computePreferredLogicalWidths();
}
void RenderListItem::positionListMarker()
......@@ -428,7 +428,7 @@ void RenderListItem::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
if (!logicalHeight() && hasOverflowClip())
return;
RenderBlock::paint(paintInfo, paintOffset);
RenderBlockFlow::paint(paintInfo, paintOffset);
}
const String& RenderListItem::markerText() const
......
......@@ -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*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment