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

third_party/WebKit/WebCore/rendering/RenderThemeChromiumWin.cpp

 /*
  * 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 13 matching lines @@
 #include "config.h"
 #include "RenderThemeChromiumWin.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vssym32.h>
 
 #include "ChromiumBridge.h"
 #include "CSSStyleSheet.h"
 #include "CSSValueKeywords.h"
-#include "Document.h"
 #include "FontSelector.h"
 #include "FontUtilsChromiumWin.h"
 #include "GraphicsContext.h"
 #include "RenderBox.h"
 #include "RenderSlider.h"
 #include "ScrollbarTheme.h"
 #include "SkiaUtils.h"
 #include "TransparencyWin.h"
 #include "UserAgentStyleSheets.h"
 #include "WindowsVersion.h"
@@ skipping 154 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 wchar_t* defaultGUIFont(Document* document)
+static wchar_t* defaultGUIFont()
 {
-    UScriptCode dominantScript = document->dominantScript();
-    const wchar_t* family = NULL;
-
-    // FIXME: Special-casing of Latin/Greeek/Cyrillic should go away once
-    // GetFontFamilyForScript is enhanced to support GenericFamilyType for
-    // real. For now, we make sure that we use Arial to match IE for those
-    // scripts.
-    if (dominantScript != USCRIPT_LATIN &&
-        dominantScript != USCRIPT_CYRILLIC &&
-        dominantScript != USCRIPT_GREEK &&
-        dominantScript != USCRIPT_INVALID_CODE) {
-        family = getFontFamilyForScript(dominantScript, FontDescription::NoFamily);
-        if (family)
-            return const_cast<wchar_t*>(family);
-    }
     return L"Arial";
 }
 
 // Converts |points| to pixels.  One point is 1/72 of an inch.
 static float pointsToPixels(float points)
 {
     static float pixelsPerInch = 0.0f;
     if (!pixelsPerInch) {
         HDC hdc = GetDC(0);  // What about printing?  Is this the right DC?
         if (hdc) {  // Can this ever actually be NULL?
@@ skipping 95 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;
 
     // This involves a system call, so we cache the result.
     static double blinkInterval = querySystemBlinkInterval(RenderTheme::caretBlinkInterval());
     return blinkInterval;
 }
 
-void RenderThemeChromiumWin::systemFont(int propId, Document* document, FontDescription& fontDescription) const
+void RenderThemeChromiumWin::systemFont(int propId, FontDescription& fontDescription) const
 {
     // This logic owes much to RenderThemeSafari.cpp.
     FontDescription* cachedDesc = NULL;
     wchar_t* faceName = 0;
     float fontSize = 0;
     switch (propId) {
     case CSSValueSmallCaption:
         cachedDesc = &smallSystemFont;
         if (!smallSystemFont.isAbsoluteSize()) {
             NONCLIENTMETRICS metrics;
@@ skipping 16 matching lines @@
         if (!labelFont.isAbsoluteSize()) {
             NONCLIENTMETRICS metrics;
             getNonClientMetrics(&metrics);
             faceName = metrics.lfStatusFont.lfFaceName;
             fontSize = systemFontSize(metrics.lfStatusFont);
         }
         break;
     case CSSValueWebkitMiniControl:
     case CSSValueWebkitSmallControl:
     case CSSValueWebkitControl:
-        faceName = defaultGUIFont(document);
+        faceName = defaultGUIFont();
         // Why 2 points smaller?  Because that's what Gecko does.
         fontSize = defaultFontSize - pointsToPixels(2);
         break;
     default:
-        faceName = defaultGUIFont(document);
+        faceName = defaultGUIFont();
         fontSize = defaultFontSize;
         break;
     }
 
     if (!cachedDesc)
         cachedDesc = &fontDescription;
 
     if (fontSize) {
         ASSERT(faceName);
         cachedDesc->firstFamily().setFamily(AtomicString(faceName,
@@ skipping 451 matching lines @@
 // static
 void RenderThemeChromiumWin::setFindInPageMode(bool enable) {
   if (m_findInPageMode == enable)
       return;
 
   m_findInPageMode = enable;
   theme()->platformColorsDidChange();
 }
 
 } // namespace WebCore