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

Unified Diff: Source/modules/notifications/WorkerGlobalScopeNotifications.cpp

Issue 178663004: Oilpan: move WorkerGlobalScope to oilpan's heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 years, 9 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/modules/notifications/WorkerGlobalScopeNotifications.cpp
diff --git a/Source/modules/notifications/WorkerGlobalScopeNotifications.cpp b/Source/modules/notifications/WorkerGlobalScopeNotifications.cpp
index d2627658a3aab35185eb56bb55debdbb94c8a18b..a3c79f9ee6e9a9f5b9d4a78cbaabc1ab3b8de010 100644
--- a/Source/modules/notifications/WorkerGlobalScopeNotifications.cpp
+++ b/Source/modules/notifications/WorkerGlobalScopeNotifications.cpp
@@ -36,7 +36,7 @@
namespace WebCore {
-WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications(WorkerGlobalScope& context)
+WorkerGlobalScopeNotifications::WorkerGlobalScopeNotifications(WorkerGlobalScope* context)
: m_context(context)
{
}
@@ -52,10 +52,10 @@ const char* WorkerGlobalScopeNotifications::supplementName()
WorkerGlobalScopeNotifications& WorkerGlobalScopeNotifications::from(WorkerGlobalScope& context)
{
- WorkerGlobalScopeNotifications* supplement = static_cast<WorkerGlobalScopeNotifications*>(WorkerSupplement::from(context, supplementName()));
+ WorkerGlobalScopeNotifications* supplement = static_cast<WorkerGlobalScopeNotifications*>(WillBeHeapSupplement<WorkerGlobalScope>::from(context, supplementName()));
if (!supplement) {
- supplement = new WorkerGlobalScopeNotifications(context);
- WorkerSupplement::provideTo(context, supplementName(), adoptPtr(supplement));
+ supplement = new WorkerGlobalScopeNotifications(&context);
+ provideTo(context, supplementName(), adoptPtrWillBeNoop(supplement));
}
return *supplement;
}
@@ -68,10 +68,16 @@ NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications(WorkerGl
NotificationCenter* WorkerGlobalScopeNotifications::webkitNotifications()
{
if (!m_notificationCenter)
- m_notificationCenter = NotificationCenter::create(&m_context, m_context.thread()->getNotificationClient());
+ m_notificationCenter = NotificationCenter::create(m_context, m_context->thread()->getNotificationClient());
return m_notificationCenter.get();
}
+void WorkerGlobalScopeNotifications::trace(Visitor* visitor)
+{
+ visitor->trace(m_context);
+ visitor->trace(m_notificationCenter);
+}
+
} // namespace WebCore
#endif // ENABLE(LEGACY_NOTIFICATIONS)

Powered by Google App Engine
This is Rietveld 408576698