Source/WebCore/ChangeLog

 12013-09-05 David Hyatt <hyatt@apple.com>
 2
 3 Make RenderListItem inherit from RenderBlockFlow.
 4 https://bugs.webkit.org/show_bug.cgi?id=120789
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * rendering/RenderListItem.cpp:
 9 (WebCore::RenderListItem::RenderListItem):
 10 (WebCore::RenderListItem::willBeDestroyed):
 11 (WebCore::RenderListItem::willBeRemovedFromTree):
 12 (WebCore::RenderListItem::layout):
 13 (WebCore::RenderListItem::addOverflowFromChildren):
 14 (WebCore::RenderListItem::computePreferredLogicalWidths):
 15 (WebCore::RenderListItem::paint):
 16 * rendering/RenderListItem.h:
 17
1182013-09-05 David Hyatt <hyatt@apple.com>
219
320 Make RenderBlock have a protected constructor..
155141

Source/WebCore/rendering/RenderListItem.cpp

@@namespace WebCore {
4242using namespace HTMLNames;
4343
4444RenderListItem::RenderListItem(Element* element)
45  : RenderBlock(element)
 45 : RenderBlockFlow(element)
4646 , m_marker(0)
4747 , m_hasExplicitValue(false)
4848 , m_isValueUpToDate(false)

@@void RenderListItem::willBeDestroyed()
7676 m_marker->destroy();
7777 m_marker = 0;
7878 }
79  RenderBlock::willBeDestroyed();
 79 RenderBlockFlow::willBeDestroyed();
8080}
8181
8282void RenderListItem::insertedIntoTree()

@@void RenderListItem::insertedIntoTree()
8888
8989void RenderListItem::willBeRemovedFromTree()
9090{
91  RenderBlock::willBeRemovedFromTree();
 91 RenderBlockFlow::willBeRemovedFromTree();
9292
9393 updateListMarkerNumbers();
9494}

@@void RenderListItem::layout()
306306 ASSERT(needsLayout());
307307
308308 insertOrMoveMarkerRendererIfNeeded();
309  RenderBlock::layout();
 309 RenderBlockFlow::layout();
310310}
311311
312312void RenderListItem::addOverflowFromChildren()
313313{
314  RenderBlock::addOverflowFromChildren();
 314 RenderBlockFlow::addOverflowFromChildren();
315315 positionListMarker();
316316}
317317

@@void RenderListItem::computePreferredLog
325325 SetLayoutNeededForbiddenScope layoutForbiddenScope(this, false);
326326#endif
327327 insertOrMoveMarkerRendererIfNeeded();
328  RenderBlock::computePreferredLogicalWidths();
 328 RenderBlockFlow::computePreferredLogicalWidths();
329329}
330330
331331void RenderListItem::positionListMarker()

@@void RenderListItem::paint(PaintInfo& pa
428428 if (!logicalHeight() && hasOverflowClip())
429429 return;
430430
431  RenderBlock::paint(paintInfo, paintOffset);
 431 RenderBlockFlow::paint(paintInfo, paintOffset);
432432}
433433
434434const String& RenderListItem::markerText() const
155138

Source/WebCore/rendering/RenderListItem.h

2323#ifndef RenderListItem_h
2424#define RenderListItem_h
2525
26 #include "RenderBlock.h"
 26#include "RenderBlockFlow.h"
2727
2828namespace WebCore {
2929
3030class HTMLOListElement;
3131class RenderListMarker;
3232
33 class RenderListItem FINAL : public RenderBlock {
 33class RenderListItem FINAL : public RenderBlockFlow {
3434public:
3535 explicit RenderListItem(Element*);
3636
155138