Changeset 252016 in webkit

Timestamp:

Nov 4, 2019 2:57:51 PM (4 years ago)

Author:

Chris Dumez

Message:

Port FontFaceSet to the HTML5 event loop
​https://bugs.webkit.org/show_bug.cgi?id=203769

Reviewed by Ryosuke Niwa.

• css/FontFaceSet.cpp:

(WebCore::FontFaceSet::didFirstLayout):
(WebCore::FontFaceSet::completedLoading):
(WebCore::FontFaceSet::faceFinished):
(WebCore::FontFaceSet::enqueueTask):

• css/FontFaceSet.h:
• dom/AbstractEventLoop.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/FontFaceSet.cpp (modified) (6 diffs)
• css/FontFaceSet.h (modified) (2 diffs)
• dom/TaskSource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-04  Chris Dumez  <cdumez@apple.com>
+
+        Port FontFaceSet to the HTML5 event loop
+        https://bugs.webkit.org/show_bug.cgi?id=203769
+
+        Reviewed by Ryosuke Niwa.
+
+        * css/FontFaceSet.cpp:
+        (WebCore::FontFaceSet::didFirstLayout):
+        (WebCore::FontFaceSet::completedLoading):
+        (WebCore::FontFaceSet::faceFinished):
+        (WebCore::FontFaceSet::enqueueTask):
+        * css/FontFaceSet.h:
+        * dom/AbstractEventLoop.h:
+
 2019-11-04  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/css/FontFaceSet.cpp

@@ -27 +27 @@
 #include "FontFaceSet.h"
 
+#include "AbstractEventLoop.h"
 #include "DOMPromiseProxy.h"
 #include "Document.h"
@@ -59 +60 @@
     , m_backing(CSSFontFaceSet::create())
     , m_readyPromise(makeUniqueRef<ReadyPromise>(*this, &FontFaceSet::readyPromiseResolve))
-    , m_taskQueue(SuspendableTaskQueue::create(document))
 {
     m_backing->addClient(*this);
@@ -70 +70 @@
     , m_backing(backing)
     , m_readyPromise(makeUniqueRef<ReadyPromise>(*this, &FontFaceSet::readyPromiseResolve))
-    , m_taskQueue(SuspendableTaskQueue::create(document))
 {
     if (document.frame())
@@ -202 +201 @@
     m_isFirstLayoutDone = true;
     if (!m_backing->hasActiveFontFaces() && !m_readyPromise->isFulfilled()) {
-        m_taskQueue->enqueueTask([this] {
+        queueTaskKeepingObjectAlive(*this, TaskSource::FontLoading, [this] {
             if (!m_readyPromise->isFulfilled())
                 m_readyPromise->resolve(*this);
@@ -212 +211 @@
 {
     if (m_isFirstLayoutDone && !m_readyPromise->isFulfilled()) {
-        m_taskQueue->enqueueTask([this] {
+        queueTaskKeepingObjectAlive(*this, TaskSource::FontLoading, [this] {
             if (!m_readyPromise->isFulfilled())
                 m_readyPromise->resolve(*this);
@@ -228 +227 @@
         return;
 
-    m_taskQueue->enqueueTask([pendingPromises = WTFMove(pendingPromises), newStatus] {
+    queueTaskKeepingObjectAlive(*this, TaskSource::FontLoading, [pendingPromises = WTFMove(pendingPromises), newStatus] {
         for (auto& pendingPromise : pendingPromises) {
             if (pendingPromise->hasReachedTerminalState)

trunk/Source/WebCore/css/FontFaceSet.h

@@ -30 +30 @@
 #include "EventTarget.h"
 #include "IDLTypes.h"
-#include "SuspendableTaskQueue.h"
 
 namespace WebCore {
@@ -119 +118 @@
     HashMap<RefPtr<FontFace>, Vector<Ref<PendingPromise>>> m_pendingPromises;
     UniqueRef<ReadyPromise> m_readyPromise;
-    UniqueRef<SuspendableTaskQueue> m_taskQueue;
     bool m_isFirstLayoutDone { true };
 };

trunk/Source/WebCore/dom/TaskSource.h

@@ -31 +31 @@
     DOMManipulation,
     FileReading,
+    FontLoading,
     IdleTask,
     Networking,