Chromium Code Reviews| Index: Source/core/loader/DocumentLoader.h |
| diff --git a/Source/core/loader/DocumentLoader.h b/Source/core/loader/DocumentLoader.h |
| index 091b0f31e9b4e7ed1cba2e589aecb478449c75e5..43267f12e92ac428e001bd7015e6d46e1de0778a 100644 |
| --- a/Source/core/loader/DocumentLoader.h |
| +++ b/Source/core/loader/DocumentLoader.h |
| @@ -48,6 +48,7 @@ |
| #include "wtf/RefPtr.h" |
| namespace blink { |
| + |
| class ApplicationCacheHost; |
| class ResourceFetcher; |
| class DocumentInit; |
| @@ -57,18 +58,18 @@ namespace blink { |
| class ResourceLoader; |
| class ThreadedDataReceiver; |
| - class CORE_EXPORT DocumentLoader : public RefCounted<DocumentLoader>, private RawResourceClient { |
| - WTF_MAKE_FAST_ALLOCATED(DocumentLoader); |
| + class CORE_EXPORT DocumentLoader : public RefCountedWillBeGarbageCollectedFinalized<DocumentLoader>, private RawResourceClient { |
| + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(DocumentLoader); |
| public: |
| - static PassRefPtr<DocumentLoader> create(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data) |
| + static PassRefPtrWillBeRawPtr<DocumentLoader> create(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data) |
| { |
| - return adoptRef(new DocumentLoader(frame, request, data)); |
| + return adoptRefWillBeNoop(new DocumentLoader(frame, request, data)); |
| } |
| virtual ~DocumentLoader(); |
| LocalFrame* frame() const { return m_frame; } |
| - void detachFromFrame(); |
| + virtual void detachFromFrame(); |
| unsigned long mainResourceIdentifier() const; |
| @@ -141,6 +142,9 @@ namespace blink { |
| void startPreload(Resource::Type, FetchRequest&); |
| + EAGERLY_FINALIZE(); |
|
haraken
2015/06/22 01:57:58
Can we add a comment for why this needs to be eage
sof
2015/06/22 06:49:18
I've removed it, as DocumentLoader currently requi
|
| + DECLARE_VIRTUAL_TRACE(); |
| + |
| protected: |
| DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&); |
| @@ -182,11 +186,11 @@ namespace blink { |
| bool shouldContinueForResponse() const; |
| LocalFrame* m_frame; |
|
haraken
2015/06/22 01:57:58
Can we make this a Member?
sof
2015/06/22 06:49:18
Done.
|
| - RefPtrWillBePersistent<ResourceFetcher> m_fetcher; |
| + RefPtrWillBeMember<ResourceFetcher> m_fetcher; |
| ResourcePtr<RawResource> m_mainResource; |
| - RefPtrWillBePersistent<DocumentWriter> m_writer; |
| + RefPtrWillBeMember<DocumentWriter> m_writer; |
| // A reference to actual request used to create the data source. |
| // The only part of this request that should change is the url, and |
| @@ -210,20 +214,20 @@ namespace blink { |
| NavigationType m_navigationType; |
| - RefPtrWillBePersistent<MHTMLArchive> m_archive; |
| + RefPtrWillBeMember<MHTMLArchive> m_archive; |
| bool m_loadingMainResource; |
| DocumentLoadTiming m_documentLoadTiming; |
| double m_timeOfLastDataReceived; |
| - friend class ApplicationCacheHost; // for substitute resource delivery |
| - OwnPtrWillBePersistent<ApplicationCacheHost> m_applicationCacheHost; |
| + PersistentWillBeMember<ApplicationCacheHost> m_applicationCacheHost; |
| RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy; |
| ClientHintsPreferences m_clientHintsPreferences; |
| InitialScrollState m_initialScrollState; |
| }; |
| -} |
| + |
| +} // namespace blink |
| #endif // DocumentLoader_h |