Unreviewed, rolling out r112489.

http://trac.webkit.org/changeset/112489
https://bugs.webkit.org/show_bug.cgi?id=82725

Tentatively introduces a lot of webfont-related test flakiness
on Snow Leopard (Requested by apavlov on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-30

* css/CSSSegmentedFontFace.cpp:
(WebCore::CSSSegmentedFontFace::getFontData):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1f09ebf..53b1751 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-30  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r112489.
+        http://trac.webkit.org/changeset/112489
+        https://bugs.webkit.org/show_bug.cgi?id=82725
+
+        Tentatively introduces a lot of webfont-related test flakiness
+        on Snow Leopard (Requested by apavlov on #webkit).
+
+        * css/CSSSegmentedFontFace.cpp:
+        (WebCore::CSSSegmentedFontFace::getFontData):
+
 2012-03-30  Keishi Hattori  <keishi@webkit.org>
 
         Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium

diff --git a/Source/WebCore/css/CSSSegmentedFontFace.cpp b/Source/WebCore/css/CSSSegmentedFontFace.cpp
index cf9ec9e..bb00d02 100644 (file)
--- a/Source/WebCore/css/CSSSegmentedFontFace.cpp
+++ b/Source/WebCore/css/CSSSegmentedFontFace.cpp
@@ -81,23 +81,6 @@ void CSSSegmentedFontFace::appendFontFace(PassRefPtr<CSSFontFace> fontFace)
     m_fontFaces.append(fontFace);
 }
 
-static void appendFontDataWithInvalidUnicodeRangeIfLoading(SegmentedFontData* newFontData, const SimpleFontData* faceFontData, const Vector<CSSFontFace::UnicodeRange>& ranges)
-{
-    if (faceFontData->isLoading()) {
-        newFontData->appendRange(FontDataRange(0, 0, faceFontData));
-        return;
-    }
-
-    unsigned numRanges = ranges.size();
-    if (!numRanges) {
-        newFontData->appendRange(FontDataRange(0, 0x7FFFFFFF, faceFontData));
-        return;
-    }
-
-    for (unsigned j = 0; j < numRanges; ++j)
-        newFontData->appendRange(FontDataRange(ranges[j].from(), ranges[j].to(), faceFontData));
-}
-
 FontData* CSSSegmentedFontFace::getFontData(const FontDescription& fontDescription)
 {
     if (!isValid())
@@ -121,7 +104,14 @@ FontData* CSSSegmentedFontFace::getFontData(const FontDescription& fontDescripti
         bool syntheticItalic = !(traitsMask & FontStyleItalicMask) && (desiredTraitsMask & FontStyleItalicMask);
         if (const SimpleFontData* faceFontData = m_fontFaces[i]->getFontData(fontDescription, syntheticBold, syntheticItalic)) {
             ASSERT(!faceFontData->isSegmented());
-            appendFontDataWithInvalidUnicodeRangeIfLoading(newFontData.get(), faceFontData, m_fontFaces[i]->ranges());
+            const Vector<CSSFontFace::UnicodeRange>& ranges = m_fontFaces[i]->ranges();
+            unsigned numRanges = ranges.size();
+            if (!numRanges)
+                newFontData->appendRange(FontDataRange(0, 0x7FFFFFFF, faceFontData));
+            else {
+                for (unsigned j = 0; j < numRanges; ++j)
+                    newFontData->appendRange(FontDataRange(ranges[j].from(), ranges[j].to(), faceFontData));
+            }
         }
     }
     if (newFontData->numRanges()) {