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

Unified Diff: Source/core/loader/appcache/ApplicationCache.cpp

Issue 552733003: Oilpan: make DOMWindowProperty a GC mixin. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Detach ApplicationCacheHost during (Oilpan) finalization Created 6 years, 3 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/ApplicationCache.cpp
diff --git a/Source/core/loader/appcache/ApplicationCache.cpp b/Source/core/loader/appcache/ApplicationCache.cpp
index ad15b38e528c743ba2e6f590c69b5a9053e8fb7c..306b7bbbf68ab01da63ce2eac00bea5fea54c88d 100644
--- a/Source/core/loader/appcache/ApplicationCache.cpp
+++ b/Source/core/loader/appcache/ApplicationCache.cpp
@@ -44,6 +44,21 @@ ApplicationCache::ApplicationCache(LocalFrame* frame)
cacheHost->setApplicationCache(this);
}
+ApplicationCache::~ApplicationCache()
+{
+ ASSERT(!m_frame);
+#if ENABLE(OILPAN)
+ if (ApplicationCacheHost* cacheHost = applicationCacheHost())
Mads Ager (chromium) 2014/09/09 12:09:44 What makes sure that m_frame is alive at this poin
sof 2014/09/09 12:53:58 Hmm, this dtor is problematic with Oilpan for two
+ cacheHost->setApplicationCache(0);
+#endif
+}
+
+void ApplicationCache::trace(Visitor* visitor)
+{
+ EventTargetWithInlineData::trace(visitor);
+ DOMWindowProperty::trace(visitor);
+}
+
void ApplicationCache::willDestroyGlobalObjectInFrame()
{
if (ApplicationCacheHost* cacheHost = applicationCacheHost())

Powered by Google App Engine
This is Rietveld 408576698