Move push client to frame.

Source/modules/push_messaging/PushManager.cpp

 // 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/PushManager.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 20 matching lines @@
 {
 }
 
 // FIXME: This call should be available from workers which will not have a Document object available.
 // See crbug.com/389194
 ScriptPromise PushManager::registerPushMessaging(ScriptState* scriptState)
 {
     ASSERT(scriptState->executionContext()->isDocument());
 
     Document* document = toDocument(scriptState->executionContext());
-    if (!document->domWindow() || !document->page())
+    if (!document->domWindow() || !document->frame())
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(AbortError, "Document is detached from window."));
 
     WebServiceWorkerProvider* serviceWorkerProvider = NavigatorServiceWorker::serviceWorker(*document->domWindow()->navigator())->provider();
     if (!serviceWorkerProvider)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(AbortError, "No Service Worker installed for this document."));
 
     // FIXME: Once everything except permission request goes through platform,
     // delete WebPushClient and usage such as this one.

[Peter Beverloo, 2014/11/12 14:24:03]

Is this FIXME still relevant?

[Michael van Ouwerkerk, 2014/11/12 14:33:01]

No, but that is not really related to the current change. I think you know what
the plan is, we talked about it in some detail.

     // See crbug.com/389194
-    WebPushClient* client = PushController::clientFrom(document->page());
+    WebPushClient* client = PushController::clientFrom(document->frame());
     ASSERT(client);
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     PushPermissionClient* permissionClient = PushPermissionClient::from(scriptState->executionContext());
     if (permissionClient)
         permissionClient->requestPermission(scriptState->executionContext(), new PushPermissionRequestCallback(this, client, resolver, serviceWorkerProvider));
     else
         doRegister(client, resolver, serviceWorkerProvider);
 
     return promise;
 }
 
 // FIXME: This call should be available from workers which will not have a Document object available.
 // See crbug.com/389194
 ScriptPromise PushManager::hasPermission(ScriptState* scriptState)
 {
     ASSERT(scriptState->executionContext()->isDocument());
 
     Document* document = toDocument(scriptState->executionContext());
-    if (!document->domWindow() || !document->page())
+    if (!document->domWindow() || !document->frame())
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Document is detached from window."));
-    blink::WebPushClient* client = PushController::clientFrom(document->page());
+    blink::WebPushClient* client = PushController::clientFrom(document->frame());
     ASSERT(client);
 
     // The currently implemented specification does not require a Service Worker to be present for the
     // hasPermission() call to work, but it will become a requirement soon.
     WebServiceWorkerProvider* serviceWorkerProvider = NavigatorServiceWorker::serviceWorker(*document->domWindow()->navigator())->provider();
     if (!serviceWorkerProvider)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "No Service Worker installed for this document."));
 
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
 
     ScriptPromise promise = resolver->promise();
     client->getPermissionStatus(new PushPermissionStatusCallback(resolver), serviceWorkerProvider);
     return promise;
 }
 
 void PushManager::doRegister(WebPushClient* client, PassRefPtr<ScriptPromiseResolver> resolver, WebServiceWorkerProvider* serviceWorkerProvider)
 {
     client->registerPushMessaging(new CallbackPromiseAdapter<PushRegistration, PushError>(resolver), serviceWorkerProvider);
 }
 
 } // namespace blink