| Index: third_party/WebKit/Source/core/loader/LinkPreloadResourceClients.h
|
| diff --git a/third_party/WebKit/Source/core/loader/LinkPreloadResourceClients.h b/third_party/WebKit/Source/core/loader/LinkPreloadResourceClients.h
|
| index 7a6153f846e7f4e9a725c844526cf5ba89a85b75..b428b6ddd44d4f117571b8c48482d3de2d2f697a 100644
|
| --- a/third_party/WebKit/Source/core/loader/LinkPreloadResourceClients.h
|
| +++ b/third_party/WebKit/Source/core/loader/LinkPreloadResourceClients.h
|
| @@ -19,7 +19,7 @@ namespace blink {
|
|
|
| class LinkLoader;
|
|
|
| -class LinkPreloadResourceClient : public NoBaseWillBeGarbageCollectedFinalized<LinkPreloadResourceClient> {
|
| +class LinkPreloadResourceClient : public GarbageCollectedFinalized<LinkPreloadResourceClient> {
|
| public:
|
| virtual ~LinkPreloadResourceClient() { }
|
|
|
| @@ -39,16 +39,15 @@ protected:
|
| }
|
|
|
| private:
|
| - RawPtrWillBeMember<LinkLoader> m_loader;
|
| + Member<LinkLoader> m_loader;
|
| };
|
|
|
| class LinkPreloadScriptResourceClient: public LinkPreloadResourceClient, public ResourceOwner<ScriptResource, ScriptResourceClient> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadScriptResourceClient);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadScriptResourceClient);
|
| + USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadScriptResourceClient);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<LinkPreloadScriptResourceClient> create(LinkLoader* loader, ScriptResource* resource)
|
| + static RawPtr<LinkPreloadScriptResourceClient> create(LinkLoader* loader, ScriptResource* resource)
|
| {
|
| - return adoptPtrWillBeNoop(new LinkPreloadScriptResourceClient(loader, resource));
|
| + return (new LinkPreloadScriptResourceClient(loader, resource));
|
| }
|
|
|
| virtual String debugName() const { return "LinkPreloadScript"; }
|
| @@ -77,12 +76,11 @@ private:
|
| };
|
|
|
| class LinkPreloadStyleResourceClient: public LinkPreloadResourceClient, public ResourceOwner<CSSStyleSheetResource, StyleSheetResourceClient> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadStyleResourceClient);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadStyleResourceClient);
|
| + USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadStyleResourceClient);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<LinkPreloadStyleResourceClient> create(LinkLoader* loader, CSSStyleSheetResource* resource)
|
| + static RawPtr<LinkPreloadStyleResourceClient> create(LinkLoader* loader, CSSStyleSheetResource* resource)
|
| {
|
| - return adoptPtrWillBeNoop(new LinkPreloadStyleResourceClient(loader, resource));
|
| + return (new LinkPreloadStyleResourceClient(loader, resource));
|
| }
|
|
|
| virtual String debugName() const { return "LinkPreloadStyle"; }
|
| @@ -111,12 +109,11 @@ private:
|
| };
|
|
|
| class LinkPreloadImageResourceClient: public LinkPreloadResourceClient, public ResourceOwner<ImageResource, ImageResourceClient> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadImageResourceClient);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadImageResourceClient);
|
| + USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadImageResourceClient);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<LinkPreloadImageResourceClient> create(LinkLoader* loader, ImageResource* resource)
|
| + static RawPtr<LinkPreloadImageResourceClient> create(LinkLoader* loader, ImageResource* resource)
|
| {
|
| - return adoptPtrWillBeNoop(new LinkPreloadImageResourceClient(loader, resource));
|
| + return (new LinkPreloadImageResourceClient(loader, resource));
|
| }
|
|
|
| virtual String debugName() const { return "LinkPreloadImage"; }
|
| @@ -145,12 +142,11 @@ private:
|
| };
|
|
|
| class LinkPreloadFontResourceClient: public LinkPreloadResourceClient, public ResourceOwner<FontResource, FontResourceClient> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadFontResourceClient);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadFontResourceClient);
|
| + USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadFontResourceClient);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<LinkPreloadFontResourceClient> create(LinkLoader* loader, FontResource* resource)
|
| + static RawPtr<LinkPreloadFontResourceClient> create(LinkLoader* loader, FontResource* resource)
|
| {
|
| - return adoptPtrWillBeNoop(new LinkPreloadFontResourceClient(loader, resource));
|
| + return (new LinkPreloadFontResourceClient(loader, resource));
|
| }
|
|
|
| virtual String debugName() const { return "LinkPreloadFont"; }
|
| @@ -179,12 +175,11 @@ private:
|
| };
|
|
|
| class LinkPreloadRawResourceClient: public LinkPreloadResourceClient, public ResourceOwner<RawResource, RawResourceClient> {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadRawResourceClient);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadRawResourceClient);
|
| + USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadRawResourceClient);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<LinkPreloadRawResourceClient> create(LinkLoader* loader, RawResource* resource)
|
| + static RawPtr<LinkPreloadRawResourceClient> create(LinkLoader* loader, RawResource* resource)
|
| {
|
| - return adoptPtrWillBeNoop(new LinkPreloadRawResourceClient(loader, resource));
|
| + return (new LinkPreloadRawResourceClient(loader, resource));
|
| }
|
|
|
| virtual String debugName() const { return "LinkPreloadRaw"; }
|
|
|