| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/css/FontLoader.h" | 5 #include "core/css/FontLoader.h" |
| 6 | 6 |
| 7 #include "core/css/CSSFontSelector.h" | 7 #include "core/css/CSSFontSelector.h" |
| 8 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
| 9 #include "core/dom/IncrementLoadEventDelayCount.h" | 9 #include "core/dom/IncrementLoadEventDelayCount.h" |
| 10 #include "core/fetch/FontResource.h" | 10 #include "core/fetch/FontResource.h" |
| 11 #include "core/inspector/ConsoleMessage.h" | 11 #include "core/inspector/ConsoleMessage.h" |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 struct FontLoader::FontToLoad : public NoBaseWillBeGarbageCollectedFinalized<Fon
tLoader::FontToLoad> { | 15 struct FontLoader::FontToLoad : public GarbageCollectedFinalized<FontLoader::Fon
tToLoad> { |
| 16 public: | 16 public: |
| 17 static PassOwnPtrWillBeRawPtr<FontToLoad> create(FontResource* fontResource,
Document& document) | 17 static RawPtr<FontToLoad> create(FontResource* fontResource, Document& docum
ent) |
| 18 { | 18 { |
| 19 return adoptPtrWillBeNoop(new FontToLoad(fontResource, document)); | 19 return (new FontToLoad(fontResource, document)); |
| 20 } | 20 } |
| 21 | 21 |
| 22 virtual ~FontToLoad() | 22 virtual ~FontToLoad() |
| 23 { | 23 { |
| 24 ASSERT(!fontResource); | 24 ASSERT(!fontResource); |
| 25 } | 25 } |
| 26 | 26 |
| 27 RefPtrWillBeMember<FontResource> fontResource; | 27 Member<FontResource> fontResource; |
| 28 OwnPtr<IncrementLoadEventDelayCount> delay; | 28 OwnPtr<IncrementLoadEventDelayCount> delay; |
| 29 | 29 |
| 30 void dispose() | 30 void dispose() |
| 31 { | 31 { |
| 32 fontResource = nullptr; | 32 fontResource = nullptr; |
| 33 delay.clear(); | 33 delay.clear(); |
| 34 } | 34 } |
| 35 | 35 |
| 36 DEFINE_INLINE_TRACE() { visitor->trace(fontResource); } | 36 DEFINE_INLINE_TRACE() { visitor->trace(fontResource); } |
| 37 | 37 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 } | 141 } |
| 142 | 142 |
| 143 DEFINE_TRACE(FontLoader) | 143 DEFINE_TRACE(FontLoader) |
| 144 { | 144 { |
| 145 visitor->trace(m_fontsToBeginLoading); | 145 visitor->trace(m_fontsToBeginLoading); |
| 146 visitor->trace(m_document); | 146 visitor->trace(m_document); |
| 147 visitor->trace(m_fontSelector); | 147 visitor->trace(m_fontSelector); |
| 148 } | 148 } |
| 149 | 149 |
| 150 } // namespace blink | 150 } // namespace blink |
| OLD | NEW |