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

third_party/WebKit/WebCore/rendering/RenderThemeChromiumWin.h

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 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 48 matching lines @@
         // The platform selection color.
         virtual Color platformActiveSelectionBackgroundColor() const;
         virtual Color platformInactiveSelectionBackgroundColor() const;
         virtual Color platformActiveSelectionForegroundColor() const;
         virtual Color platformInactiveSelectionForegroundColor() const;
         virtual Color platformTextSearchHighlightColor() const;
 
         virtual double caretBlinkInterval() const;
 
         // System fonts.
-        virtual void systemFont(int propId, Document*, FontDescription&) const;
+        virtual void systemFont(int propId, FontDescription&) const;
 
         virtual int minimumMenuListSize(RenderStyle*) const;
 
         virtual void adjustSliderThumbSize(RenderObject*) const;
 
         virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) { return paintButton(o, i, r); }
         virtual void setCheckboxSize(RenderStyle*) const;
 
         virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r) { return paintButton(o, i, r); }
         virtual void setRadioSize(RenderStyle*) const;
@@ skipping 68 matching lines @@
 
         int menuListInternalPadding(RenderStyle*, int paddingType) const;
 
         // A flag specifying whether we are in Find-in-page mode or not.
         static bool m_findInPageMode;
     };
 
 } // namespace WebCore
 
 #endif