Factor code from ThemeMac into ThemeMacPainter.

third_party/WebKit/Source/core/paint/ThemePainter.cpp

 /**
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 38 matching lines @@
     if (!LayoutTheme::isEnabled(o))
         return WebFallbackThemeEngine::StateDisabled;
     if (LayoutTheme::isPressed(o))
         return WebFallbackThemeEngine::StatePressed;
     if (LayoutTheme::isHovered(o))
         return WebFallbackThemeEngine::StateHover;
 
     return WebFallbackThemeEngine::StateNormal;
 }
 
-ThemePainter::ThemePainter(Theme* platformTheme)
-    : m_platformTheme(platformTheme)
+ThemePainter::ThemePainter()
 {
 }
 
 bool ThemePainter::paint(const LayoutObject& o, const PaintInfo& paintInfo, const IntRect&r)
 {
     ControlPart part = o.styleRef().appearance();
 
     if (LayoutTheme::theme().shouldUseFallbackTheme(o.styleRef()))
         return paintUsingFallbackTheme(o, paintInfo, r);
 
     if (part == ButtonPart && o.node()) {
         UseCounter::count(o.document(), UseCounter::CSSValueAppearanceButtonRendered);
         if (isHTMLAnchorElement(o.node())) {
             UseCounter::count(o.document(), UseCounter::CSSValueAppearanceButtonForAnchor);
         } else if (isHTMLButtonElement(o.node())) {
             UseCounter::count(o.document(), UseCounter::CSSValueAppearanceButtonForButton);
         } else if (isHTMLInputElement(o.node()) && toHTMLInputElement(o.node())->isTextButton()) {
             // Text buttons (type=button, reset, submit) has
             // -webkit-appearance:push-button by default.
             UseCounter::count(o.node()->document(), UseCounter::CSSValueAppearanceButtonForOtherButtons);
         }
     }
 
-    if (m_platformTheme) {
-        switch (part) {
-        case CheckboxPart:
-        case RadioPart:
-        case PushButtonPart:
-        case SquareButtonPart:
-        case ButtonPart:
-        case InnerSpinButtonPart:
-            m_platformTheme->paint(part, LayoutTheme::controlStatesForLayoutObject(o), const_cast<GraphicsContext&>(paintInfo.context), r, o.styleRef().effectiveZoom(), o.view()->frameView());
-            return false;
-        default:
-            break;
-        }
-    }
-
     // Call the appropriate paint method based off the appearance value.
     switch (part) {
     case CheckboxPart:
         return paintCheckbox(o, paintInfo, r);
     case RadioPart:
         return paintRadio(o, paintInfo, r);
     case PushButtonPart:
     case SquareButtonPart:
     case ButtonPart:
         return paintButton(o, paintInfo, r);
@@ skipping 261 matching lines @@
         i.context.translate(unzoomedRect.x(), unzoomedRect.y());
         i.context.scale(zoomLevel, zoomLevel);
         i.context.translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
     Platform::current()->fallbackThemeEngine()->paint(canvas, WebFallbackThemeEngine::PartRadio, getWebFallbackThemeState(o), WebRect(unzoomedRect), &extraParams);
     return false;
 }
 
 } // namespace blink