Refactor RenderThemeChromiumDefault

Source/core/rendering/RenderThemeChromiumDefault.cpp

 /*
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Collabora Ltd.
  * Copyright (C) 2008, 2009 Google Inc.
  * Copyright (C) 2009 Kenneth Rohde Christiansen
  *
  * 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 57 matching lines @@
     if (theme->isPressed(o))
         return WebThemeEngine::StatePressed;
     if (useMockTheme() && theme->isFocused(o))
         return WebThemeEngine::StateFocused;
     if (theme->isHovered(o))
         return WebThemeEngine::StateHover;
 
     return WebThemeEngine::StateNormal;
 }
 
-PassRefPtr<RenderTheme> RenderThemeChromiumDefault::create()
-{
-    return adoptRef(new RenderThemeChromiumDefault());
-}
-
-// RenderTheme::theme for Android is defined in RenderThemeChromiumAndroid.cpp.
-#if !OS(ANDROID)
-RenderTheme& RenderTheme::theme()
-{
-    DEFINE_STATIC_REF(RenderTheme, renderTheme, (RenderThemeChromiumDefault::create()));
-    return *renderTheme;
-}
-#endif
-
 RenderThemeChromiumDefault::RenderThemeChromiumDefault()
 {
     m_caretBlinkInterval = RenderTheme::caretBlinkInterval();
 }
 
 RenderThemeChromiumDefault::~RenderThemeChromiumDefault()
 {
 }
 
 bool RenderThemeChromiumDefault::supportsFocusRing(const RenderStyle* style) const
@@ skipping 18 matching lines @@
             return Color(0xc0, 0xc0, 0xc0);
         return defaultButtonGrayColor;
     }
     if (cssValueId == CSSValueMenu)
         return defaultMenuColor;
     return RenderTheme::systemColor(cssValueId);
 }
 
 String RenderThemeChromiumDefault::extraDefaultStyleSheet()
 {
-    // FIXME: We should not have OS() branches here.
-    // We should have something like RenderThemeWin, RenderThemeLinux, or
-    // should concatenate UA stylesheets on build time.
-#if !OS(WIN)
-    return RenderThemeChromiumSkia::extraDefaultStyleSheet() +
-#if !OS(ANDROID)
-        String(themeInputMultipleFieldsCss, sizeof(themeInputMultipleFieldsCss)) +
-#endif
-        String(themeChromiumLinuxCss, sizeof(themeChromiumLinuxCss));
+#if ENABLE(INPUT_MULTIPLE_FIELDS_UI)
+    return RenderThemeChromiumSkia::extraDefaultStyleSheet()
+        + String(themeInputMultipleFieldsCss, sizeof(themeInputMultipleFieldsCss));
 #else
-    return RenderThemeChromiumSkia::extraDefaultStyleSheet() +
-        String(themeInputMultipleFieldsCss, sizeof(themeInputMultipleFieldsCss));
+    return RenderThemeChromiumSkia::extraDefaultStyleSheet();
 #endif
 }
 
 Color RenderThemeChromiumDefault::activeListBoxSelectionBackgroundColor() const
 {
     return Color(0x28, 0x28, 0x28);
 }
 
 Color RenderThemeChromiumDefault::activeListBoxSelectionForegroundColor() const
 {
@@ skipping 363 matching lines @@
     if (useMockTheme()) {
         // The mock theme can't handle zoomed controls, so we fall back to the "fallback" theme.
         ControlPart part = style->appearance();
         if (part == CheckboxPart || part == RadioPart)
             return style->effectiveZoom() != 1;
     }
     return RenderTheme::shouldUseFallbackTheme(style);
 }
 
 } // namespace blink