| Index: Source/core/loader/appcache/ApplicationCacheHost.h
|
| diff --git a/Source/core/loader/appcache/ApplicationCacheHost.h b/Source/core/loader/appcache/ApplicationCacheHost.h
|
| index 95aae19307c8a92aa6ce92a6bbaacfc86d0fb4ef..a6087eaa622010625d4e18ae7b0f24db8fb519b0 100644
|
| --- a/Source/core/loader/appcache/ApplicationCacheHost.h
|
| +++ b/Source/core/loader/appcache/ApplicationCacheHost.h
|
| @@ -43,16 +43,16 @@
|
| class ResourceRequest;
|
| class ResourceResponse;
|
|
|
| - class ApplicationCacheHost final : public GarbageCollectedFinalized<ApplicationCacheHost>, public WebApplicationCacheHostClient {
|
| + class ApplicationCacheHost final : public NoBaseWillBeGarbageCollectedFinalized<ApplicationCacheHost>, public WebApplicationCacheHostClient {
|
| WTF_MAKE_NONCOPYABLE(ApplicationCacheHost);
|
| public:
|
| - static ApplicationCacheHost* create(DocumentLoader* loader)
|
| + static PassOwnPtrWillBeRawPtr<ApplicationCacheHost> create(DocumentLoader* loader)
|
| {
|
| - return new ApplicationCacheHost(loader);
|
| + return adoptPtrWillBeNoop(new ApplicationCacheHost(loader));
|
| }
|
| + virtual ~ApplicationCacheHost();
|
|
|
| - virtual ~ApplicationCacheHost();
|
| - void detachFromDocumentLoader();
|
| + void dispose();
|
|
|
| // The Status numeric values are specified in the HTML5 spec.
|
| enum Status {
|
| @@ -165,8 +165,8 @@
|
| }
|
| };
|
|
|
| - WeakMember<ApplicationCache> m_domApplicationCache;
|
| - RawPtrWillBeMember<DocumentLoader> m_documentLoader;
|
| + RawPtrWillBeWeakMember<ApplicationCache> m_domApplicationCache;
|
| + DocumentLoader* m_documentLoader;
|
| bool m_defersEvents; // Events are deferred until after document onload.
|
| Vector<DeferredEvent> m_deferredEvents;
|
|
|
|
|