Title: [223358] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 223358
- Author
- [email protected]
- Date
- 2017-10-16 02:46:46 -0700 (Mon, 16 Oct 2017)
Log Message
Merge r221835 - 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (223357 => 223358)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-16 09:41:12 UTC (rev 223357)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-10-16 09:46:46 UTC (rev 223358)
@@ -1,3 +1,14 @@
+2017-09-07 Darin Adler <[email protected]>
+
+ 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 <[email protected]>
gl.detachShader breaks shader program
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/css/FontFaceSet.cpp (223357 => 223358)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/css/FontFaceSet.cpp 2017-10-16 09:41:12 UTC (rev 223357)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/css/FontFaceSet.cpp 2017-10-16 09:46:46 UTC (rev 223358)
@@ -63,8 +63,9 @@
, 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()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
