Make CSSFontFace::setLoadStatus post a task

third_party/WebKit/Source/core/css/CSSFontFace.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/css/CSSFontFace.h"
 
 #include "core/css/CSSFontFaceSource.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/FontFaceSet.h"
 #include "core/css/RemoteFontFaceSource.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/UseCounter.h"
+#include "platform/WebTaskRunner.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/SimpleFontData.h"
 #include <algorithm>
 
 namespace blink {
 
 void CSSFontFace::addSource(CSSFontFaceSource* source) {
   source->setFontFace(this);
   m_sources.append(source);
 }
@@ skipping 124 matching lines @@
           setLoadStatus(FontFace::Loaded);
         return;
       }
     }
     m_sources.removeFirst();
   }
   setLoadStatus(FontFace::Error);
 }
 
 void CSSFontFace::setLoadStatus(FontFace::LoadStatusType newStatus) {
-  ASSERT(m_fontFace);
+  DCHECK(m_fontFace);
+  m_loadStatus = newStatus;
+  if (newStatus == FontFace::Loading) {
+    m_fontFace->setLoadStatus(newStatus);
+  } else {
+    TaskRunnerHelper::get(TaskType::DOMManipulation,
+                          m_fontFace->getExecutionContext())
+        ->postTask(BLINK_FROM_HERE, WTF::bind(&CSSFontFace::setLoadStatusHelper,
+                                              wrapPersistent(this), newStatus));
+    return;
+  }
+
+  if (!m_segmentedFontFace)

[jbroman, 2017/01/05 20:01:08]

nit: it's a little confusing that stuff that only happens in the
FontFace::Loading case is both here and above (in the if statement). Would you
mind restructuring to put them together? Either like this:

if (newStatus != FontFace::Loading) {
  // post task
  return;
}

m_fontFace->setLoadStatus(newStatus);
// segmented font face stuff

or like this:

if (newStatus == FontFace::Loading) {
  m_fontFace->setLoadStatus(newStatus);
  // segmented font face stuff
} else {
  // post task
}

or something similar

+    return;
+  Document* document = m_segmentedFontFace->fontSelector()->document();
+  if (document)
+    FontFaceSet::from(*document)->beginFontLoading(m_fontFace);
+}
+
+void CSSFontFace::setLoadStatusHelper(FontFace::LoadStatusType newStatus) {
+  DCHECK(m_fontFace);
   if (newStatus == FontFace::Error)
     m_fontFace->setError();
   else
     m_fontFace->setLoadStatus(newStatus);
-
-  if (!m_segmentedFontFace)
-    return;
-  Document* document = m_segmentedFontFace->fontSelector()->document();
-  if (document && newStatus == FontFace::Loading)
-    FontFaceSet::from(*document)->beginFontLoading(m_fontFace);
 }
 
 DEFINE_TRACE(CSSFontFace) {
   visitor->trace(m_segmentedFontFace);
   visitor->trace(m_sources);
   visitor->trace(m_fontFace);
 }
 
 }  // namespace blink