Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1248)

Unified Diff: Source/core/loader/appcache/ApplicationCacheHost.h

Issue 1194003004: Oilpan: enable appcache + move DocumentLoader to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add outer loader protection Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/appcache/ApplicationCacheHost.h
diff --git a/Source/core/loader/appcache/ApplicationCacheHost.h b/Source/core/loader/appcache/ApplicationCacheHost.h
index a6087eaa622010625d4e18ae7b0f24db8fb519b0..89a529d77dcdb97fbafffb2340bfb026e15b60fe 100644
--- a/Source/core/loader/appcache/ApplicationCacheHost.h
+++ b/Source/core/loader/appcache/ApplicationCacheHost.h
@@ -43,12 +43,12 @@ namespace blink {
class ResourceRequest;
class ResourceResponse;
- class ApplicationCacheHost final : public NoBaseWillBeGarbageCollectedFinalized<ApplicationCacheHost>, public WebApplicationCacheHostClient {
+ class ApplicationCacheHost final : public GarbageCollectedFinalized<ApplicationCacheHost>, public WebApplicationCacheHostClient {
WTF_MAKE_NONCOPYABLE(ApplicationCacheHost);
public:
- static PassOwnPtrWillBeRawPtr<ApplicationCacheHost> create(DocumentLoader* loader)
+ static ApplicationCacheHost* create(DocumentLoader* loader)
{
- return adoptPtrWillBeNoop(new ApplicationCacheHost(loader));
+ return new ApplicationCacheHost(loader);
}
virtual ~ApplicationCacheHost();
@@ -131,6 +131,7 @@ namespace blink {
void fillResourceList(ResourceInfoList*);
CacheInfo applicationCacheInfo();
+ EAGERLY_FINALIZE();
haraken 2015/06/22 01:57:59 Add a comment why this needs to be eagerly finaliz
sof 2015/06/22 06:49:18 No longer needed; asserted for that in the destruc
DECLARE_TRACE();
private:
@@ -165,8 +166,8 @@ namespace blink {
}
};
- RawPtrWillBeWeakMember<ApplicationCache> m_domApplicationCache;
- DocumentLoader* m_documentLoader;
+ WeakMember<ApplicationCache> m_domApplicationCache;
+ RawPtrWillBeMember<DocumentLoader> m_documentLoader;
bool m_defersEvents; // Events are deferred until after document onload.
Vector<DeferredEvent> m_deferredEvents;

Powered by Google App Engine
This is Rietveld 408576698