Changeset 42260 in webkit

Timestamp:

Apr 6, 2009 4:11:59 PM (15 years ago)

Author:

Dimitri Glazkov

Message:

2009-04-06 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=25059
Remove references to dominantScript, getGenericFontForScript.

• platform/graphics/chromium/FontCacheChromiumWin.cpp: Removed references

to getGenericFontForScript.

(WebCore::FontCache::getLastResortFallbackFont): Removed calls to dominantScript.

• platform/graphics/chromium/FontCacheLinux.cpp: Ditto.
• rendering/RenderThemeChromiumLinux.cpp: (WebCore::defaultGUIFont): Removed Document* arg. (WebCore::RenderThemeChromiumLinux::systemFont): Ditto.
• rendering/RenderThemeChromiumLinux.h: Ditto.
• rendering/RenderThemeChromiumMac.h: Ditto.
• rendering/RenderThemeChromiumMac.mm: Ditto. (WebCore::RenderThemeChromiumMac::systemFont): Ditto.
• rendering/RenderThemeChromiumWin.cpp: (WebCore::defaultGUIFont): Ditto. (WebCore::RenderThemeChromiumWin::systemFont): Ditto.
• rendering/RenderThemeChromiumWin.h: Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontCacheChromiumWin.cpp (modified) (2 diffs)
• platform/graphics/chromium/FontCacheLinux.cpp (modified) (1 diff)
• rendering/RenderThemeChromiumLinux.cpp (modified) (3 diffs)
• rendering/RenderThemeChromiumLinux.h (modified) (1 diff)
• rendering/RenderThemeChromiumMac.h (modified) (1 diff)
• rendering/RenderThemeChromiumMac.mm (modified) (2 diffs)
• rendering/RenderThemeChromiumWin.cpp (modified) (4 diffs)
• rendering/RenderThemeChromiumWin.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-06  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25059
+        Remove references to dominantScript, getGenericFontForScript.
+
+        * platform/graphics/chromium/FontCacheChromiumWin.cpp: Removed references
+            to getGenericFontForScript.
+        (WebCore::FontCache::getLastResortFallbackFont): Removed calls to dominantScript.
+        * platform/graphics/chromium/FontCacheLinux.cpp: Ditto.
+        * rendering/RenderThemeChromiumLinux.cpp:
+        (WebCore::defaultGUIFont): Removed Document* arg.
+        (WebCore::RenderThemeChromiumLinux::systemFont): Ditto.
+        * rendering/RenderThemeChromiumLinux.h: Ditto.
+        * rendering/RenderThemeChromiumMac.h: Ditto.
+        * rendering/RenderThemeChromiumMac.mm: Ditto.
+        (WebCore::RenderThemeChromiumMac::systemFont): Ditto.
+        * rendering/RenderThemeChromiumWin.cpp:
+        (WebCore::defaultGUIFont): Ditto.
+        (WebCore::RenderThemeChromiumWin::systemFont): Ditto.
+        * rendering/RenderThemeChromiumWin.h: Ditto.
+
 2009-04-06  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp

@@ -415 +415 @@
 {
     FontDescription::GenericFamilyType generic = description.genericFamily();
-    // FIXME: Mapping webkit generic to GenericFamilyType needs to
-    // be more intelligent. 
-    // This spot rarely gets reached. GetFontDataForCharacters() gets hit a lot
-    // more often (see FIXME comment there). 
-    const wchar_t* family = getFontFamilyForScript(description.dominantScript(), generic);
-
-    if (family)
-        return getCachedFontPlatformData(description, AtomicString(family, wcslen(family)));
 
     // FIXME: Would be even better to somehow get the user's default font here.
@@ -454 +446 @@
     };
     return gdiFontWeights[fontWeight];
-}
-
-// FIXME: This may not be the best place to put this function
-AtomicString FontCache::getGenericFontForScript(UScriptCode script, const FontDescription& description)
-{
-    const wchar_t* scriptFont = getFontFamilyForScript( script, description.genericFamily());
-    return scriptFont ? AtomicString(scriptFont, wcslen(scriptFont)) : emptyAtom;
 }
 

trunk/WebCore/platform/graphics/chromium/FontCacheLinux.cpp

@@ -160 +160 @@
 }
 
-AtomicString FontCache::getGenericFontForScript(UScriptCode script,
-                                                const FontDescription& descript)
-{
-    notImplemented();
-    return AtomicString();
-}
-
 }  // namespace WebCore

trunk/WebCore/rendering/RenderThemeChromiumLinux.cpp

@@ -89 +89 @@
 // 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";
@@ -156 +156 @@
 }
 
-void RenderThemeChromiumLinux::systemFont(int propId, Document* document, FontDescription& fontDescription) const
+void RenderThemeChromiumLinux::systemFont(int propId, FontDescription& fontDescription) const
 {
     float fontSize = DefaultFontSize;
@@ -173 +173 @@
     }
 
-    fontDescription.firstFamily().setFamily(defaultGUIFont(NULL));
+    fontDescription.firstFamily().setFamily(defaultGUIFont());
     fontDescription.setSpecifiedSize(fontSize);
     fontDescription.setIsAbsoluteSize(true);

trunk/WebCore/rendering/RenderThemeChromiumLinux.h

@@ -57 +57 @@
 
         // System fonts.
-        virtual void systemFont(int propId, Document*, FontDescription&) const;
+        virtual void systemFont(int propId, FontDescription&) const;
 
         virtual int minimumMenuListSize(RenderStyle*) const;

trunk/WebCore/rendering/RenderThemeChromiumMac.h

@@ -68 +68 @@
 
         // System fonts.
-        virtual void systemFont(int cssValueId, Document*, FontDescription&) const;
+        virtual void systemFont(int cssValueId, FontDescription&) const;
 
         virtual int minimumMenuListSize(RenderStyle*) const;

trunk/WebCore/rendering/RenderThemeChromiumMac.mm

@@ -34 +34 @@
 #import "CSSStyleSelector.h"
 #import "CSSValueKeywords.h"
-#import "Document.h"
 #import "Element.h"
 #import "FoundationExtras.h"
@@ -193 +192 @@
 }
 
-void RenderThemeChromiumMac::systemFont(int cssValueId, Document* document, FontDescription& fontDescription) const
+void RenderThemeChromiumMac::systemFont(int cssValueId, FontDescription& fontDescription) const
 {
     static FontDescription systemFont;

trunk/WebCore/rendering/RenderThemeChromiumWin.cpp

@@ -32 +32 @@
 #include "CSSStyleSheet.h"
 #include "CSSValueKeywords.h"
-#include "Document.h"
 #include "FontSelector.h"
 #include "FontUtilsChromiumWin.h"
@@ -207 +206 @@
 // 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)
-{
-    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);
-    }
+static wchar_t* defaultGUIFont()
+{
     return L"Arial";
 }
@@ -339 +323 @@
 }
 
-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.
@@ -376 +360 @@
     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;

trunk/WebCore/rendering/RenderThemeChromiumWin.h

@@ -67 +67 @@
 
         // System fonts.
-        virtual void systemFont(int propId, Document*, FontDescription&) const;
+        virtual void systemFont(int propId, FontDescription&) const;
 
         virtual int minimumMenuListSize(RenderStyle*) const;