Consolidate and delete a bunch of paint methods.

sky/engine/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 630 matching lines @@
     // otherwise poses problems when the aggregate is not
     // fully opaque.
     if (htmlElement && htmlElement->renderer())
         result = result.blend(htmlElement->renderer()->style()->colorIncludingFallback(CSSPropertyBackgroundColor));
 
     return result;
 }
 
 void FrameView::paint(GraphicsContext* context, const IntRect& rect)
 {
-    paintContents(context, rect);
-}
-
-void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
-{
 #ifndef NDEBUG
     bool fillWithRed;
     if (isTransparent())
         fillWithRed = false; // Transparent, don't fill with red.
     else
         fillWithRed = true;
 
     if (fillWithRed)
-        p->fillRect(rect, Color(0xFF, 0, 0));
+        context->fillRect(rect, Color(0xFF, 0, 0));
 #endif
 
     RenderView* renderView = this->renderView();
     if (!renderView) {
         WTF_LOG_ERROR("called FrameView::paint with nil renderer");
         return;
     }
 
     RELEASE_ASSERT(!needsLayout());
     ASSERT(m_frame->document()->lifecycle().state() >= DocumentLifecycle::StyleAndLayoutClean);
 
     bool isTopLevelPainter = !s_inPaintContents;
     s_inPaintContents = true;
 
     FontCachePurgePreventer fontCachePurgePreventer;
 
     ASSERT(!m_isPainting);
     m_isPainting = true;
 
     RenderLayer* rootLayer = renderView->layer();
 
 #if ENABLE(ASSERT)
     renderView->assertSubtreeIsLaidOut();
     RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
 #endif
 
-    rootLayer->paint(p, rect);
+    rootLayer->paint(context, rect);
 
     m_isPainting = false;
     m_lastPaintTime = currentTime();
 
     if (isTopLevelPainter) {
         // Everything that happens after paintContents completions is considered
         // to be part of the next frame.
         s_currentFrameTimeStamp = currentTime();
         s_inPaintContents = false;
     }
@@ skipping 116 matching lines @@
     totalObjects = 0;
 
     for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
         ++totalObjects;
         if (o->needsLayout())
             ++needsLayoutObjects;
     }
 }
 
 } // namespace blink