Use ScriptPromiseResolverWithContext.

Source/core/css/FontFaceSet.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:
  *
  * 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 11 matching lines @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/FontFaceSet.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "bindings/v8/Dictionary.h"
 #include "bindings/v8/NewScriptState.h"
-#include "bindings/v8/ScriptPromiseResolver.h"
+#include "bindings/v8/ScriptPromiseResolverWithContext.h"
 #include "core/css/CSSFontFaceLoadEvent.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/css/parser/BisonCSSParser.h"
 #include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/FontFaceCache.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/FrameView.h"
@@ skipping 15 matching lines @@
     void loadFonts(ExecutionContext*);
     ScriptPromise promise() { return m_resolver->promise(); }
 
     virtual void notifyLoaded(FontFace*) OVERRIDE;
     virtual void notifyError(FontFace*) OVERRIDE;
 
 private:
     LoadFontPromiseResolver(FontFaceArray faces, ExecutionContext* context)
         : m_numLoading(faces.size())
         , m_errorOccured(false)
-        , m_scriptState(NewScriptState::current(toIsolate(context)))
-        , m_resolver(ScriptPromiseResolver::create(context))
+        , m_resolver(ScriptPromiseResolverWithContext::create(NewScriptState::current(toIsolate(context))))
     {
         m_fontFaces.swap(faces);
     }
 
     FontFaceArray m_fontFaces;
     int m_numLoading;
     bool m_errorOccured;
-    RefPtr<NewScriptState> m_scriptState;
-    RefPtr<ScriptPromiseResolver> m_resolver;
+    RefPtr<ScriptPromiseResolverWithContext> m_resolver;
 };
 
 void LoadFontPromiseResolver::loadFonts(ExecutionContext* context)
 {
     if (!m_numLoading) {
         m_resolver->resolve(m_fontFaces);
         return;
     }
 
     for (size_t i = 0; i < m_fontFaces.size(); i++)
         m_fontFaces[i]->loadWithCallback(this, context);
 }
 
 void LoadFontPromiseResolver::notifyLoaded(FontFace* fontFace)
 {
     m_numLoading--;
     if (m_numLoading || m_errorOccured)
         return;
 
-    NewScriptState::Scope scope(m_scriptState.get());
     m_resolver->resolve(m_fontFaces);
 }
 
 void LoadFontPromiseResolver::notifyError(FontFace* fontFace)
 {
     m_numLoading--;
     if (!m_errorOccured) {
         m_errorOccured = true;
-        NewScriptState::Scope scope(m_scriptState.get());
         m_resolver->reject(fontFace->error());
     }
 }
 
 class FontsReadyPromiseResolver {
 public:
     static PassOwnPtr<FontsReadyPromiseResolver> create(ExecutionContext* context)
     {
         return adoptPtr(new FontsReadyPromiseResolver(context));
     }
 
     void resolve(PassRefPtr<FontFaceSet> fontFaceSet)
     {
-        NewScriptState::Scope scope(m_scriptState.get());
         m_resolver->resolve(fontFaceSet);
     }
 
     ScriptPromise promise() { return m_resolver->promise(); }
 
 private:
     FontsReadyPromiseResolver(ExecutionContext* context)
-        : m_scriptState(NewScriptState::current(toIsolate(context)))
-        , m_resolver(ScriptPromiseResolver::create(context))
+        : m_resolver(ScriptPromiseResolverWithContext::create(NewScriptState::current(toIsolate(context))))
     {
     }
 
-    RefPtr<NewScriptState> m_scriptState;
-    RefPtr<ScriptPromiseResolver> m_resolver;
+    RefPtr<ScriptPromiseResolverWithContext> m_resolver;
 };
 
 FontFaceSet::FontFaceSet(Document& document)
     : ActiveDOMObject(&document)
     , m_shouldFireLoadingEvent(false)
     , m_asyncRunner(this, &FontFaceSet::handlePendingEventsAndPromises)
 {
     suspendIfNeeded();
 }
 
@@ skipping 426 matching lines @@
         fonts->didLayout();
 }
 
 #if ENABLE(OILPAN)
 void FontFaceSet::trace(Visitor* visitor)
 {
 }
 #endif
 
 } // namespace WebCore