wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1161413 - Part 3: Only reflow from the font face loader if we have a pres context. r=jdaggett

Browse Source
This commit is contained in:
Cameron McCormack 2015-06-27 11:39:54 +10:00
parent 1a147dda51
commit f8e4d123ba
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/style/nsFontFaceLoader.cpp
View File

@ -118,7 +118,6 @@ nsFontFaceLoader::LoadTimerCallback(nsITimer* aTimer, void* aClosure)
if (updateUserFontSet) { if (updateUserFontSet) {
ufe->mFontDataLoadingState = gfxUserFontEntry::LOADING_SLOWLY; ufe->mFontDataLoadingState = gfxUserFontEntry::LOADING_SLOWLY;
nsPresContext* ctx = loader->mFontFaceSet->GetPresContext(); nsPresContext* ctx = loader->mFontFaceSet->GetPresContext();
NS_ASSERTION(ctx, "userfontset doesn't have a presContext?");
if (ctx) { if (ctx) {
loader->mFontFaceSet->IncrementGeneration(); loader->mFontFaceSet->IncrementGeneration();
ctx->UserFontSetUpdated(loader->GetUserFontEntry()); ctx->UserFontSetUpdated(loader->GetUserFontEntry());
@ -155,10 +154,6 @@ nsFontFaceLoader::OnStreamComplete(nsIStreamLoader* aLoader,
} }
} }
nsPresContext* ctx = mFontFaceSet->GetPresContext();
NS_ASSERTION(ctx && !ctx->PresShell()->IsDestroying(),
"We should have been canceled already");
if (NS_SUCCEEDED(aStatus)) { if (NS_SUCCEEDED(aStatus)) {
// for HTTP requests, check whether the request _actually_ succeeded; // for HTTP requests, check whether the request _actually_ succeeded;
// the "request status" in aStatus does not necessarily indicate this, // the "request status" in aStatus does not necessarily indicate this,
@ -184,11 +179,12 @@ nsFontFaceLoader::OnStreamComplete(nsIStreamLoader* aLoader,
// This is called even in the case of a failed download (HTTP 404, etc), // This is called even in the case of a failed download (HTTP 404, etc),
// as there may still be data to be freed (e.g. an error page), // as there may still be data to be freed (e.g. an error page),
// and we need to load the next source. // and we need to load the next source.
nsPresContext* ctx = mFontFaceSet->GetPresContext();
bool fontUpdate = bool fontUpdate =
mUserFontEntry->FontDataDownloadComplete(aString, aStringLen, aStatus); mUserFontEntry->FontDataDownloadComplete(aString, aStringLen, aStatus);
// when new font loaded, need to reflow // when new font loaded, need to reflow
if (fontUpdate) { if (fontUpdate && ctx) {
// Update layout for the presence of the new font. Since this is // Update layout for the presence of the new font. Since this is
// asynchronous, reflows will coalesce. // asynchronous, reflows will coalesce.
ctx->UserFontSetUpdated(mUserFontEntry); ctx->UserFontSetUpdated(mUserFontEntry);