Decrease call sites of ScriptState::current()

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 46 matching lines @@
 #include "core/frame/Settings.h"
 #include "core/svg/SVGFontFaceElement.h"
 #include "core/svg/SVGFontFaceSource.h"
 #include "core/svg/SVGRemoteFontFaceSource.h"
 #include "platform/SharedBuffer.h"
 
 namespace WebCore {
 
 class FontFaceReadyPromiseResolver {
 public:
-    static PassOwnPtr<FontFaceReadyPromiseResolver> create(ExecutionContext* context)
+    static PassOwnPtr<FontFaceReadyPromiseResolver> create(ScriptState* scriptState)
     {
-        return adoptPtr(new FontFaceReadyPromiseResolver(context));
+        return adoptPtr(new FontFaceReadyPromiseResolver(scriptState));
     }
 
     void resolve(PassRefPtrWillBeRawPtr<FontFace> fontFace)
     {
         switch (fontFace->loadStatus()) {
         case FontFace::Loaded:
             m_resolver->resolve(fontFace);
             break;
         case FontFace::Error:
             m_resolver->reject(fontFace->error());
             break;
         default:
             ASSERT_NOT_REACHED();
         }
     }
 
     ScriptPromise promise() { return m_resolver->promise(); }
 
 private:
-    FontFaceReadyPromiseResolver(ExecutionContext* context)
-        : m_resolver(ScriptPromiseResolverWithContext::create(ScriptState::current(toIsolate(context))))
+    FontFaceReadyPromiseResolver(ScriptState* scriptState)
+        : m_resolver(ScriptPromiseResolverWithContext::create(scriptState))
     {
     }
 
     RefPtr<ScriptPromiseResolverWithContext> m_resolver;
 };
 
 static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& s, CSSPropertyID propertyID)
 {
     if (s.isEmpty())
         return nullptr;
@@ skipping 281 matching lines @@
         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);
         }
     }
 }
 
-ScriptPromise FontFace::load(ExecutionContext* context)
+ScriptPromise FontFace::load(ScriptState* scriptState)
 {
-    OwnPtr<FontFaceReadyPromiseResolver> resolver = FontFaceReadyPromiseResolver::create(context);
+    OwnPtr<FontFaceReadyPromiseResolver> resolver = FontFaceReadyPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (m_status == Loaded || m_status == Error)
         resolver->resolve(this);
     else
         m_readyResolvers.append(resolver.release());
 
-    loadInternal(context);
+    loadInternal(scriptState->executionContext());
     return promise;
 }
 
 void FontFace::loadWithCallback(PassRefPtrWillBeRawPtr<LoadFontCallback> callback, ExecutionContext* context)
 {
     loadInternal(context);
     if (m_status == Loaded)
         callback->notifyLoaded(this);
     else if (m_status == Error)
         callback->notifyError(this);
@@ skipping 210 matching lines @@
     visitor->trace(m_cssFontFace);
     visitor->trace(m_callbacks);
 }
 
 bool FontFace::hadBlankText() const
 {
     return m_cssFontFace->hadBlankText();
 }
 
 } // namespace WebCore