Merge r221835 - Fix double resolve assertion in FontFaceSet seen whil…

…e 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.
WebKit · Oct 16, 2017 · 5c6caac · 5c6caac
1 parent 089002b
commit 5c6caac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -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

diff --git a/Source/WebCore/css/FontFaceSet.cpp b/Source/WebCore/css/FontFaceSet.cpp
@@ -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()