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

third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.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.
  *
  * 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 70 matching lines @@
 
 // We aim to match IE here.
 // -IE uses a font based on the encoding as the default font for form controls.
 // -Gecko uses MS Shell Dlg (actually calls GetStockObject(DEFAULT_GUI_FONT),
 // which returns MS Shell Dlg)
 // -Safari uses Lucida Grande.
 //
 // FIXME: The only case where we know we don't match IE is for ANSI encodings.
 // IE uses MS Shell Dlg there, which we render incorrectly at certain pixel
 // sizes (e.g. 15px). So, for now we just use Arial.
-static const char* defaultGUIFont(Document* document)
+static const char* defaultGUIFont()
 {
     return "Arial";
 }
 
 RenderTheme* theme()
 {
     static RenderThemeChromiumLinux theme;
     return &theme;
 }
 
@@ skipping 46 matching lines @@
 {
     // Disable the blinking caret in layout test mode, as it introduces
     // a race condition for the pixel tests. http://b/1198440
     if (ChromiumBridge::layoutTestMode())
         return 0;
 
     // We cache the interval so we don't have to repeatedly request it from gtk.
     return 0.5;
 }
 
-void RenderThemeChromiumLinux::systemFont(int propId, Document* document, FontDescription& fontDescription) const
+void RenderThemeChromiumLinux::systemFont(int propId, FontDescription& fontDescription) const
 {
     float fontSize = DefaultFontSize;
 
     switch (propId) {
     case CSSValueWebkitMiniControl:
     case CSSValueWebkitSmallControl:
     case CSSValueWebkitControl:
         // Why 2 points smaller? Because that's what Gecko does. Note that we
         // are assuming a 96dpi screen, which is the default that we use on
         // Windows.
         static const float pointsPerInch = 72.0f;
         static const float pixelsPerInch = 96.0f;
         fontSize -= (2.0f / pointsPerInch) * pixelsPerInch;
         break;
     }
 
-    fontDescription.firstFamily().setFamily(defaultGUIFont(NULL));
+    fontDescription.firstFamily().setFamily(defaultGUIFont());
     fontDescription.setSpecifiedSize(fontSize);
     fontDescription.setIsAbsoluteSize(true);
     fontDescription.setGenericFamily(FontDescription::NoFamily);
     fontDescription.setWeight(FontWeightNormal);
     fontDescription.setItalic(false);
 }
 
 int RenderThemeChromiumLinux::minimumMenuListSize(RenderStyle* style) const
 {
     return 0;
@@ skipping 327 matching lines @@
     // If the MenuList actually has appearance "NoAppearance", then that means
     // we don't draw a button, so don't reserve space for it.
     const int bar_type = style->direction() == LTR ? RightPadding : LeftPadding;
     if (paddingType == bar_type && style->appearance() != NoControlPart)
         padding += ScrollbarTheme::nativeTheme()->scrollbarThickness();
 
     return padding;
 }
 
 }  // namespace WebCore