Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Font loads quickly followed by navigations may fail indefinitely
https://bugs.webkit.org/show_bug.cgi?id=215435 <rdar://problem/65560550> Reviewed by Darin Adler. Source/WebCore: Font loads are coalesced using a zero-delay timer. However, that zero-delay timer can fire while the page is in the middle of a navigation, which will cause the font loads to fail. Then, the second page can request those same fonts, which are marked as failed, and as such will never actually load/use the desired web font. This patch just stops the zero-delay timer during navigations, and resumes it when resuming the document. This means: 1. The second page in the above story will not see that the font has failed, or even started, and will then re-request the font and load it successfully 2. If the user goes "back" to the previous page, the zero-delay timer is restarted, the CachedFont realizes it's already succeeded, and the previous page is rendered as expected. Test: fast/loader/font-load-timer.html * css/CSSFontSelector.cpp: (WebCore::CSSFontSelector::suspendFontLoadingTimer): (WebCore::CSSFontSelector::restartFontLoadingTimer): * css/CSSFontSelector.h: * dom/Document.cpp: (WebCore::Document::resume): * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::stopLoading): LayoutTests: 1) The page has some content that has “font-family: WebFont” but there are no @font-face blocks on the page 2) In script, after the page has loaded, add an @font-face rule to the page with “font-family: WebFont” and some valid font URL 3) Synchronously, within the same turn of the run loop, trigger a synchronous layout of the element (using offsetWidth or something). This will add the font to the 0-delay time work list. 4) Synchronously, within the same turn of the run loop, navigate to a second page that doesn’t use the web font. 5) The second page waits some small-but-positive amount of time. This will cause the 0-delay timer to fire, but because the page is in the middle of navigating, the font load should fail. 6) The second page adds the same @font-face rule to itself using script. This should pull the same (failed) CachedResource object out of the memory cache. 7) Use the CSS Font Loading API to wait for the font load to complete 8) Make sure that the font is used on the second page (as a reference test). Today, the second page’s font load will fail because it pulled the failed font out of the memory cache. The test makes sure the second page’s font load succeeds. * fast/loader/font-load-timer-expected.html: Added. * fast/loader/font-load-timer.html: Added. * fast/loader/resources/font-load-timer-navigation-destination.html: Added. Canonical link: https://commits.webkit.org/228221@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
9 changed files
with
142 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<style id="style"> | ||
@font-face { | ||
font-family: 'WebFont'; | ||
src: url('../../resources/Ahem.ttf') format('truetype'); | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<span id="target" style="font: 48px 'WebFont';">HelloWorld!</span> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<style id="style"></style> | ||
</head> | ||
<body> | ||
<span id="target" style="font: 48px 'WebFont';">Hello, World!</span> | ||
<script> | ||
if (window.testRunner) | ||
testRunner.waitUntilDone(); | ||
|
||
if (window.internals) { | ||
internals.invalidateFontCache(); | ||
internals.clearMemoryCache(); | ||
} | ||
|
||
document.getElementById("style").sheet.insertRule("@font-face { font-family: 'WebFont'; src: url('../../resources/Ahem.ttf') format('truetype'); }"); | ||
document.getElementById("target").offsetWidth; | ||
window.location = "resources/font-load-timer-navigation-destination.html"; | ||
</script> | ||
</body> | ||
</html> |
21 changes: 21 additions & 0 deletions
21
LayoutTests/fast/loader/resources/font-load-timer-navigation-destination.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<style id="style"></style> | ||
</head> | ||
<body> | ||
<span id="target" style="font: 48px 'WebFont';">HelloWorld!</span> | ||
<script> | ||
window.setTimeout(function() { | ||
document.getElementById("style").sheet.insertRule("@font-face { font-family: 'WebFont'; src: url('../../../resources/Ahem.ttf') format('truetype'); }"); | ||
document.fonts.entries().next().value.load().then(function() { | ||
if (window.testRunner) | ||
testRunner.notifyDone(); | ||
}, function() { | ||
if (window.testRunner) | ||
testRunner.notifyDone(); | ||
}); | ||
}, 100); | ||
</script> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters