Make CSSFontFace::setLoadStatus post a task

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

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
 #include "core/css/RemoteFontFaceSource.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/StyleEngine.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "platform/FontFamilyNames.h"
 #include "platform/Histogram.h"
 #include "platform/SharedBuffer.h"
+#include "platform/WebTaskRunner.h"
 
 namespace blink {
 
 static const CSSValue* parseCSSValue(const Document* document,
                                      const String& value,
                                      CSSPropertyID propertyID) {
   CSSParserContext context(*document, UseCounter::getFrom(document));
   return CSSParser::parseFontFaceDescriptor(propertyID, value, context);
 }
 
@@ skipping 272 matching lines @@
   }
   return emptyString();
 }
 
 void FontFace::setLoadStatus(LoadStatusType status) {
   m_status = status;
   ASSERT(m_status != Error || m_error);
 
   if (m_status == Loaded || m_status == Error) {
     if (m_loadedProperty) {
-      if (m_status == Loaded)
-        m_loadedProperty->resolve(this);
-      else
+      if (m_status == Loaded) {

[jbroman, 2017/01/12 18:40:46]

Would you mind adding a comment explaining why this is necessary for resolve and
not reject? Ideally we would treat both the same, so an explanation of why
they're different would be breat.

[adithyas, 2017/01/13 16:08:39]

Added a comment.

+        getTaskRunner()->postTask(
+            BLINK_FROM_HERE, WTF::bind(&LoadedProperty::resolve<FontFace*>,
+                                       wrapPersistent(m_loadedProperty.get()),
+                                       wrapPersistent(this)));
+      } else
         m_loadedProperty->reject(m_error.get());
     }
 
-    HeapVector<Member<LoadFontCallback>> callbacks;
-    m_callbacks.swap(callbacks);
-    for (size_t i = 0; i < callbacks.size(); ++i) {
-      if (m_status == Loaded)
-        callbacks[i]->notifyLoaded(this);
-      else
-        callbacks[i]->notifyError(this);
-    }
+    getTaskRunner()->postTask(
+        BLINK_FROM_HERE,
+        WTF::bind(&FontFace::runCallbacks, wrapPersistent(this)));
   }
 }
 
+WebTaskRunner* FontFace::getTaskRunner() {
+  return TaskRunnerHelper::get(TaskType::DOMManipulation, getExecutionContext())
+      .get();
+}
+
+void FontFace::runCallbacks() {
+  HeapVector<Member<LoadFontCallback>> callbacks;
+  m_callbacks.swap(callbacks);
+  for (size_t i = 0; i < callbacks.size(); ++i) {
+    if (m_status == Loaded)
+      callbacks[i]->notifyLoaded(this);
+    else
+      callbacks[i]->notifyError(this);
+  }
+}
+
 void FontFace::setError(DOMException* error) {
   if (!m_error)
     m_error = error ? error : DOMException::create(NetworkError);
   setLoadStatus(Error);
 }
 
 ScriptPromise FontFace::fontStatusPromise(ScriptState* scriptState) {
   if (!m_loadedProperty) {
     m_loadedProperty = new LoadedProperty(scriptState->getExecutionContext(),
                                           this, LoadedProperty::Loaded);
@@ skipping 258 matching lines @@
 
 bool FontFace::hadBlankText() const {
   return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const {
   return m_status == Loading && getExecutionContext();
 }
 
 }  // namespace blink