Changeset 58447 in webkit

Timestamp:

Apr 28, 2010 5:38:40 PM (14 years ago)

Author:

evan@chromium.org

Message:

2010-04-28 Evan Martin <​evan@chromium.org>

Reviewed by David Levin.

[chromium] revert getFontDataForCharacters change in r58341
​https://bugs.webkit.org/show_bug.cgi?id=38288

• platform/chromium/test_expectations.txt: add the test to the now-failing list.

2010-04-28 Evan Martin <​evan@chromium.org>

Reviewed by David Levin.

[chromium] revert getFontDataForCharacters change in r58341
​https://bugs.webkit.org/show_bug.cgi?id=38288

It caused a performance regression.

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-28  Evan Martin  <evan@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] revert getFontDataForCharacters change in r58341
+        https://bugs.webkit.org/show_bug.cgi?id=38288
+
+        * platform/chromium/test_expectations.txt: add the test to the now-failing list.
+
 2010-04-28  Eric Seidel  <eric@webkit.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2869 +2869 @@
 // WebKit roll 58304:58400
 BUGUKAI WIN MAC : fast/text/international/bold-bengali.html = MISSING
+
+// We're reverting the patch that fixed this test on Linux due to
+// the perf regression described in the bug.
+BUG42760 LINUX : fast/text/international/bold-bengali.html = FAIL

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-28  Evan Martin  <evan@chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] revert getFontDataForCharacters change in r58341
+        https://bugs.webkit.org/show_bug.cgi?id=38288
+
+        It caused a performance regression.
+
+        * platform/chromium/ChromiumBridge.h:
+        * platform/graphics/chromium/FontCacheLinux.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
+
 2010-04-28  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/platform/chromium/ChromiumBridge.h

@@ -117 +117 @@
 #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)
 {
-    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)
+    String family = ChromiumBridge::getFontFamilyForCharacters(characters, length);
+    if (family.isEmpty())
         return 0;
 
-    // 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);
+    AtomicString atomicFamily(family);
+    return getCachedFontData(getCachedFontPlatformData(font.fontDescription(), atomicFamily, false));
 }