Changeset 93171 in webkit

Timestamp:

Aug 16, 2011, 3:58:26 PM (15 years ago)

Author:

Joseph Pecoraro

Message:

<​http://webkit.org/b/66328> ASSERT in fast/css/custom-font-xheight.html

Reviewed by Dan Bernstein.

In r93140 the temporary font created for a remote CSS font face
was created without being retained. We need to protect the
font from being purged while we hold onto it, so add a font cache
purge preventer.

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::getFontData):

• platform/chromium/test_expectations.txt:

Unskipped.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSFontFaceSource.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-16  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Unreviewed, unskipping the test.
+
+        ASSERT in fast/css/custom-font-xheight.html
+        https://bugs.webkit.org/show_bug.cgi?id=66328
+
+        * platform/chromium/test_expectations.txt:
+        Test should no longer ASSERT.
+
 2011-08-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3385 +3385 @@
 BUGCR83499 MAC : fast/box-shadow/box-shadow-transformed.html = PASS IMAGE+TEXT IMAGE
 
-BUGCR83504 WIN RELEASE : fast/css/custom-font-xheight.html = PASS TIMEOUT
+BUGCR83504 WIN : fast/css/custom-font-xheight.html = PASS TIMEOUT
 
 // New test from WK r87026
@@ -3684 +3684 @@
 BUGTONY : fast/repaint/line-flow-with-floats-in-regions.html = IMAGE+TEXT IMAGE
 
-// When removing, make sure to update the WIN line to apply to debug and
-// release.
-BUGWK66328 DEBUG : fast/css/custom-font-xheight.html = CRASH
-
 BUGWK66338 MAC : fast/repaint/background-scaling.html = IMAGE
 BUGWK66338 MAC : fast/repaint/scale-page-shrink.html = IMAGE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-16  Joseph Pecoraro  <joepeck@webkit.org>
+
+        ASSERT in fast/css/custom-font-xheight.html
+        https://bugs.webkit.org/show_bug.cgi?id=66328
+
+        Reviewed by Dan Bernstein.
+
+        In r93140 the temporary font created for a remote CSS font face
+        was created without being retained. We need to protect the
+        font from being purged while we hold onto it, so add a font cache
+        purge preventer.
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData):
+
 2011-08-16  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -186 +186 @@
             m_loadStartTimer.startOneShot(0);
 
-        SimpleFontData* tempData = fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
-        fontData = adoptPtr(new SimpleFontData(tempData->platformData(), true, true));
+        // This temporary font is not retained and should not be returned.
+        FontCachePurgePreventer fontCachePurgePreventer;
+        SimpleFontData* temporaryFont = fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
+        fontData = adoptPtr(new SimpleFontData(temporaryFont->platformData(), true, true));
     }