| Index: third_party/WebKit/Source/core/css/FontLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/FontLoader.cpp b/third_party/WebKit/Source/core/css/FontLoader.cpp
|
| index 54958908a78e8a7a943fb99880e186fb60dce70c..98d9ce9210eb728606c473646713dccb0ce06d81 100644
|
| --- a/third_party/WebKit/Source/core/css/FontLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/css/FontLoader.cpp
|
| @@ -12,11 +12,11 @@
|
|
|
| namespace blink {
|
|
|
| -struct FontLoader::FontToLoad : public NoBaseWillBeGarbageCollectedFinalized<FontLoader::FontToLoad> {
|
| +struct FontLoader::FontToLoad : public GarbageCollectedFinalized<FontLoader::FontToLoad> {
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<FontToLoad> create(FontResource* fontResource, Document& document)
|
| + static RawPtr<FontToLoad> create(FontResource* fontResource, Document& document)
|
| {
|
| - return adoptPtrWillBeNoop(new FontToLoad(fontResource, document));
|
| + return new FontToLoad(fontResource, document);
|
| }
|
|
|
| virtual ~FontToLoad()
|
| @@ -24,7 +24,7 @@ public:
|
| ASSERT(!fontResource);
|
| }
|
|
|
| - RefPtrWillBeMember<FontResource> fontResource;
|
| + Member<FontResource> fontResource;
|
| OwnPtr<IncrementLoadEventDelayCount> delay;
|
|
|
| void dispose()
|
|
|