Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of...

third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.h

 /*
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005 Apple Computer, Inc.
  * Copyright (C) 2008, 2009 Google, 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 49 matching lines @@
         virtual bool isControlStyled(const RenderStyle*, const BorderData&,
                                      const FillLayer&, const Color& backgroundColor) const;
 
         virtual Color platformActiveSelectionBackgroundColor() const;
         virtual Color platformInactiveSelectionBackgroundColor() const;
         virtual Color activeListBoxSelectionBackgroundColor() const;
         
         virtual void platformColorsDidChange();
 
         // System fonts.
-        virtual void systemFont(int cssValueId, Document*, FontDescription&) const;
+        virtual void systemFont(int cssValueId, FontDescription&) const;
 
         virtual int minimumMenuListSize(RenderStyle*) const;
 
         virtual void adjustSliderThumbSize(RenderObject*) const;
         
         virtual int popupInternalPaddingLeft(RenderStyle*) const;
         virtual int popupInternalPaddingRight(RenderStyle*) const;
         virtual int popupInternalPaddingTop(RenderStyle*) const;
         virtual int popupInternalPaddingBottom(RenderStyle*) const;
         
@@ skipping 123 matching lines @@
         bool m_isSliderThumbVerticalPressed;
 
         mutable HashMap<int, RGBA32> m_systemColorCache;
 
         RetainPtr<WebCoreRenderThemeNotificationObserver> m_notificationObserver;
     };
 
 } // namespace WebCore
 
 #endif