diff options
Diffstat (limited to 'Source/core/css/FontFaceSet.cpp')
| -rw-r--r-- | Source/core/css/FontFaceSet.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/Source/core/css/FontFaceSet.cpp b/Source/core/css/FontFaceSet.cpp index e7a8da432..631a213d3 100644 --- a/Source/core/css/FontFaceSet.cpp +++ b/Source/core/css/FontFaceSet.cpp @@ -29,7 +29,7 @@ #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" @@ -65,8 +65,7 @@ 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); } @@ -74,8 +73,7 @@ private: 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) @@ -95,7 +93,6 @@ void LoadFontPromiseResolver::notifyLoaded(FontFace* fontFace) if (m_numLoading || m_errorOccured) return; - NewScriptState::Scope scope(m_scriptState.get()); m_resolver->resolve(m_fontFaces); } @@ -104,7 +101,6 @@ void LoadFontPromiseResolver::notifyError(FontFace* fontFace) m_numLoading--; if (!m_errorOccured) { m_errorOccured = true; - NewScriptState::Scope scope(m_scriptState.get()); m_resolver->reject(fontFace->error()); } } @@ -118,7 +114,6 @@ public: void resolve(PassRefPtr<FontFaceSet> fontFaceSet) { - NewScriptState::Scope scope(m_scriptState.get()); m_resolver->resolve(fontFaceSet); } @@ -126,13 +121,11 @@ public: 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) @@ -555,9 +548,9 @@ static const char* supplementName() return "FontFaceSet"; } -PassRefPtr<FontFaceSet> FontFaceSet::from(Document& document) +PassRefPtrWillBeRawPtr<FontFaceSet> FontFaceSet::from(Document& document) { - RefPtr<FontFaceSet> fonts = static_cast<FontFaceSet*>(SupplementType::from(document, supplementName())); + RefPtrWillBeRawPtr<FontFaceSet> fonts = static_cast<FontFaceSet*>(SupplementType::from(document, supplementName())); if (!fonts) { fonts = FontFaceSet::create(document); SupplementType::provideTo(document, supplementName(), fonts); @@ -572,5 +565,10 @@ void FontFaceSet::didLayout(Document& document) fonts->didLayout(); } +#if ENABLE(OILPAN) +void FontFaceSet::trace(Visitor* visitor) +{ +} +#endif } // namespace WebCore |