Push API: move PushManager from Navigator to ServiceWorkerRegistration [switchover 6/6]

Source/modules/push_messaging/ServiceWorkerRegistrationPush.cpp

Index: Source/modules/push_messaging/ServiceWorkerRegistrationPush.cpp
diff --git a/Source/modules/push_messaging/ServiceWorkerRegistrationPush.cpp b/Source/modules/push_messaging/ServiceWorkerRegistrationPush.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..84f4b1eb8ddabb71c021ec64bb1eacc6b736cbd2
--- /dev/null
+++ b/Source/modules/push_messaging/ServiceWorkerRegistrationPush.cpp
@@ -0,0 +1,56 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "config.h"
+#include "modules/push_messaging/ServiceWorkerRegistrationPush.h"
+
+#include "modules/push_messaging/PushManager.h"
+#include "modules/serviceworkers/ServiceWorkerRegistration.h"
+
+namespace blink {
+
+ServiceWorkerRegistrationPush::ServiceWorkerRegistrationPush(ServiceWorkerRegistration* registration)
+    : m_registration(registration)
+{
+}
+
+ServiceWorkerRegistrationPush::~ServiceWorkerRegistrationPush()
+{
+}
+
+const char* ServiceWorkerRegistrationPush::supplementName()
+{
+    return "ServiceWorkerRegistrationPush";
+}
+
+ServiceWorkerRegistrationPush& ServiceWorkerRegistrationPush::from(ServiceWorkerRegistration& registration)
+{
+    ServiceWorkerRegistrationPush* supplement = static_cast<ServiceWorkerRegistrationPush*>(HeapSupplement<ServiceWorkerRegistration>::from(registration, supplementName()));
+    if (!supplement) {
+        supplement = new ServiceWorkerRegistrationPush(&registration);
+        provideTo(registration, supplementName(), supplement);
+    }
+    return *supplement;
+}
+
+PushManager* ServiceWorkerRegistrationPush::pushManager(ServiceWorkerRegistration& registration)
+{
+    return ServiceWorkerRegistrationPush::from(registration).pushManager();
+}
+
+PushManager* ServiceWorkerRegistrationPush::pushManager()
+{
+    if (!m_pushManager)
+        m_pushManager = PushManager::create(m_registration);
+    return m_pushManager.get();
+}
+
+void ServiceWorkerRegistrationPush::trace(Visitor* visitor)
+{
+    visitor->trace(m_registration);
+    visitor->trace(m_pushManager);
+    HeapSupplement<ServiceWorkerRegistration>::trace(visitor);

[Peter Beverloo, 2014/12/08 21:40:51]

HeapSupplement<> should come before the local members.

[Michael van Ouwerkerk, 2014/12/09 18:47:45]

All existing code seems to do the opposite, local members go first. I could find
no examples of what you described. Sometimes other parent calls go after though.
Who would know the finer details about this? I thought of pinging Sigbjorn but
wasn't sure about pinging an Opera member.

+}
+
+} // namespace blink