Consolidate and delete a bunch of paint methods.

sky/engine/core/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 457 matching lines @@
     ContentsClipBehavior contentsClipBehavior = ForceContentsClip;
     if (hasOverflowClip() && !(shouldPaintSelectionGaps() && phase == PaintPhaseForeground) && !hasCaret())
         contentsClipBehavior = SkipContentsClipIfPossible;
 
     bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset, contentsClipBehavior);
     paintObject(paintInfo, adjustedPaintOffset);
     if (pushedClip)
         popContentsClip(paintInfo, phase, adjustedPaintOffset);
 }
 
-void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
-    // FIXME(sky): Can we remove paintContents and just keep paintChildren?
-    paintChildren(paintInfo, paintOffset);
-}
-
 void RenderBlock::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox())
-        paintChild(child, paintInfo, paintOffset);
-}
-
-void RenderBlock::paintChild(RenderBox* child, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
-    if (!child->hasSelfPaintingLayer())
-        child->paint(paintInfo, paintOffset);
-}
-
-void RenderBlock::paintChildAsInlineBlock(RenderBox* child, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
-{
-    if (!child->hasSelfPaintingLayer())
-        paintAsInlineBlock(child, paintInfo, paintOffset);
-}
-
-void RenderBlock::paintAsInlineBlock(RenderObject* renderer, PaintInfo& paintInfo, const LayoutPoint& childPoint)
-{
-    // FIXME(sky): Remove this function.
-    renderer->paint(paintInfo, childPoint);
+    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+        if (!child->hasSelfPaintingLayer())
+            child->paint(paintInfo, paintOffset);
+    }
 }
 
 static inline bool hasCursorCaret(const FrameSelection& selection, const RenderBlock* block)
 {
     return selection.caretRenderer() == block && selection.hasEditableStyle();
 }
 
 static inline bool hasDragCaret(const DragCaretController& dragCaretController, const RenderBlock* block)
 {
     return dragCaretController.caretRenderer() == block && dragCaretController.isContentEditable();
@@ skipping 16 matching lines @@
     if (hasDragCaret(dragCaretController, this)) {
         dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect);
     }
 }
 
 void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     if (hasBoxDecorationBackground())
         paintBoxDecorationBackground(paintInfo, paintOffset);
 
-    paintContents(paintInfo, paintOffset);
+    paintChildren(paintInfo, paintOffset);
     paintSelection(paintInfo, paintOffset); // Fill in gaps in selection on lines and between blocks.
 
     if (style()->hasOutline() && !style()->outlineStyleIsAuto())
         paintOutline(paintInfo, LayoutRect(paintOffset, size()));
 
     paintCarets(paintInfo, paintOffset);
 }
 
 bool RenderBlock::shouldPaintSelectionGaps() const
 {
@@ skipping 1240 matching lines @@
 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj) const
 {
     showRenderObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink