Changeset 221835 in webkit
- Timestamp:
- Sep 10, 2017 11:55:24 AM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r221831 r221835 1 2017-09-07 Darin Adler <darin@apple.com> 2 3 Fix double resolve assertion in FontFaceSet seen while running tests 4 https://bugs.webkit.org/show_bug.cgi?id=176525 5 6 Reviewed by Brent Fulgham. 7 8 * css/FontFaceSet.cpp: 9 (WebCore::FontFaceSet::FontFaceSet): Only resolve the promise if the CSSFontFaceSet 10 is already loaded. Otherwise, we will resolve it later when it calls completedLoading. 11 1 12 2017-09-08 Dean Jackson <dino@apple.com> 2 13 -
trunk/Source/WebCore/css/FontFaceSet.cpp
r220620 r221835 64 64 , m_readyPromise(*this, &FontFaceSet::readyPromiseResolve) 65 65 { 66 m_readyPromise.resolve(*this);67 66 m_backing->addClient(*this); 67 if (m_backing->status() == CSSFontFaceSet::Status::Loaded) 68 m_readyPromise.resolve(*this); 68 69 } 69 70
Note: See TracChangeset
for help on using the changeset viewer.