Changeset 59483 in webkit

Timestamp:

May 14, 2010 1:16:12 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-14 Evan Martin <​evan@chromium.org>

Reviewed by David Levin.

[chromium] don't call fontconfig twice in complex text path
​https://bugs.webkit.org/show_bug.cgi?id=38701

Previously getFontDataForCharacters would call fontconfig once to
resolve a font name, then pass that name to getCachedFontPlatformData
to load the font. This would be two trips through fontconfig (including
IPCs). With this change, we completely load the font in the first pass.

This patch is actually the same code as in r58341, which was reverted
because of a performance problem; a performance improvement has now
been committed, and with that change in place this change improves
the Chromium intl2 page cycler performance by another 5%.

See also ​https://bugs.webkit.org/show_bug.cgi?id=37904 .

Test: fast/text/international/bold-bengali.html
(Was checked in as part of the first attempt at this change, continues
to pass after this change.)

• platform/chromium/ChromiumBridge.h:
• platform/graphics/chromium/FontCacheLinux.cpp: (WebCore::FontCache::getFontDataForCharacters):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ChromiumBridge.h (modified) (1 diff)
• platform/graphics/chromium/FontCacheLinux.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-14  Evan Martin  <evan@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] don't call fontconfig twice in complex text path
+        https://bugs.webkit.org/show_bug.cgi?id=38701
+
+        Previously getFontDataForCharacters would call fontconfig once to
+        resolve a font name, then pass that name to getCachedFontPlatformData
+        to load the font.  This would be two trips through fontconfig (including
+        IPCs).  With this change, we completely load the font in the first pass.
+
+        This patch is actually the same code as in r58341, which was reverted
+        because of a performance problem; a performance improvement has now
+        been committed, and with that change in place this change improves
+        the Chromium intl2 page cycler performance by another 5%.
+
+        See also https://bugs.webkit.org/show_bug.cgi?id=37904 .
+
+        Test: fast/text/international/bold-bengali.html
+        (Was checked in as part of the first attempt at this change, continues
+        to pass after this change.)
+
+        * platform/chromium/ChromiumBridge.h:
+        * platform/graphics/chromium/FontCacheLinux.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
+
 2010-05-14  Young Han Lee  <joybro@company100.net>
 

trunk/WebCore/platform/chromium/ChromiumBridge.h

@@ -126 +126 @@
 #if OS(LINUX)
         static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);
+        // This code is currently in the process of getting rejiggered, and though
+        // it is not currently used, it will hopefully be used again soon.
         static String getFontFamilyForCharacters(const UChar*, size_t numCharacters);
 #endif

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

@@ -59 +59 @@
                                                           int length)
 {
-    String family = ChromiumBridge::getFontFamilyForCharacters(characters, length);
-    if (family.isEmpty())
+    int style = SkTypeface::kNormal;
+    if (font.fontDescription().weight() >= FontWeightBold)
+        style |= SkTypeface::kBold;
+    if (font.fontDescription().italic())
+        style |= SkTypeface::kItalic;
+
+    SkTypeface* tf = SkTypeface::CreateForChars(characters, length * 2,
+                                                static_cast<SkTypeface::Style>(style));
+    if (!tf)
         return 0;
 
-    AtomicString atomicFamily(family);
-    return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, false));
+    // FIXME: we don't have a family name for this font.
+    // However, the family name within FontPlatformData is only used when picking
+    // a render style for the font, so it's not too great of a loss.
+    FontPlatformData result(tf,
+                            "",
+                            font.fontDescription().computedSize(),
+                            (style & SkTypeface::kBold) && !tf->isBold(),
+                            (style & SkTypeface::kItalic) && !tf->isItalic());
+    tf->unref();
+    return getCachedFontData(&result);
 }