Changeset 221835 in webkit


Ignore:
Timestamp:
Sep 10, 2017 11:55:24 AM (7 years ago)
Author:
Darin Adler
Message:

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.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r221831 r221835  
     12017-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
    1122017-09-08  Dean Jackson  <dino@apple.com>
    213
  • trunk/Source/WebCore/css/FontFaceSet.cpp

    r220620 r221835  
    6464    , m_readyPromise(*this, &FontFaceSet::readyPromiseResolve)
    6565{
    66     m_readyPromise.resolve(*this);
    6766    m_backing->addClient(*this);
     67    if (m_backing->status() == CSSFontFaceSet::Status::Loaded)
     68        m_readyPromise.resolve(*this);
    6869}
    6970
Note: See TracChangeset for help on using the changeset viewer.