Skip to content
Permalink
Browse files
Fix double resolve assertion in FontFaceSet seen while running tests
https://bugs.webkit.org/show_bug.cgi?id=176525

Reviewed by Brent Fulgham.

* css/FontFaceSet.cpp:
(WebCore::FontFaceSet::FontFaceSet): Only resolve the promise if the CSSFontFaceSet
is already loaded. Otherwise, we will resolve it later when it calls completedLoading.

Canonical link: https://commits.webkit.org/193184@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221835 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
darinadler committed Sep 10, 2017
1 parent 5f29140 commit 72e992fd38d542b7c646dcd3b81201dc017763ca
Showing with 13 additions and 1 deletion.
  1. +11 −0 Source/WebCore/ChangeLog
  2. +2 −1 Source/WebCore/css/FontFaceSet.cpp
@@ -1,3 +1,14 @@
2017-09-07 Darin Adler <darin@apple.com>

Fix double resolve assertion in FontFaceSet seen while running tests
https://bugs.webkit.org/show_bug.cgi?id=176525

Reviewed by Brent Fulgham.

* css/FontFaceSet.cpp:
(WebCore::FontFaceSet::FontFaceSet): Only resolve the promise if the CSSFontFaceSet
is already loaded. Otherwise, we will resolve it later when it calls completedLoading.

2017-09-08 Dean Jackson <dino@apple.com>

gl.detachShader breaks shader program
@@ -63,8 +63,9 @@ FontFaceSet::FontFaceSet(Document& document, CSSFontFaceSet& backing)
, m_backing(backing)
, m_readyPromise(*this, &FontFaceSet::readyPromiseResolve)
{
m_readyPromise.resolve(*this);
m_backing->addClient(*this);
if (m_backing->status() == CSSFontFaceSet::Status::Loaded)
m_readyPromise.resolve(*this);
}

FontFaceSet::~FontFaceSet()

0 comments on commit 72e992f

Please sign in to comment.