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

third_party/WebKit/WebCore/rendering/RenderTheme.h

 /*
  * This file is part of the theme implementation for form controls in WebCore.
  *
  * Copyright (C) 2005, 2006, 2007, 2008 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 106 matching lines @@
     Color inactiveListBoxSelectionBackgroundColor() const;
     Color inactiveListBoxSelectionForegroundColor() const;
 
     virtual Color platformTextSearchHighlightColor() const;
 
     virtual void platformColorsDidChange();
 
     virtual double caretBlinkInterval() const { return 0.5; }
 
     // System fonts and colors for CSS.
-    virtual void systemFont(int cssValueId, Document*, FontDescription&) const = 0;
+    virtual void systemFont(int cssValueId, FontDescription&) const = 0;
     virtual Color systemColor(int cssValueId) const;
 
     virtual int minimumMenuListSize(RenderStyle*) const { return 0; }
 
     virtual void adjustSliderThumbSize(RenderObject*) const;
 
     virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingRight(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingTop(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingBottom(RenderStyle*) const { return 0; }
@@ skipping 117 matching lines @@
 #endif
 };
 
 // Function to obtain the theme.  This is implemented in your platform-specific theme implementation to hand
 // back the appropriate platform theme.
 RenderTheme* theme();
 
 } // namespace WebCore
 
 #endif // RenderTheme_h