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

Unified Diff: Source/modules/push_messaging/PushManager.cpp

Issue 687933002: Move push client to frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 6 years, 2 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/push_messaging/PushManager.cpp
diff --git a/Source/modules/push_messaging/PushManager.cpp b/Source/modules/push_messaging/PushManager.cpp
index 63c44ea60d14e24124539a38297cdd209a13449e..ab059279827ecacc6498c92aaa43ab555c1b9ade 100644
--- a/Source/modules/push_messaging/PushManager.cpp
+++ b/Source/modules/push_messaging/PushManager.cpp
@@ -33,14 +33,14 @@ ScriptPromise PushManager::registerPushMessaging(ScriptState* scriptState)
ASSERT(scriptState->executionContext()->isDocument());
Document* document = toDocument(scriptState->executionContext());
- if (!document->domWindow() || !document->page())
+ if (!document->domWindow() || !document->page() || !document->frame())
Peter Beverloo 2014/10/29 11:25:07 Remove the "!document->page()" check.
Michael van Ouwerkerk 2014/11/11 17:20:06 Done.
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."));
- WebPushClient* client = PushController::clientFrom(document->page());
+ WebPushClient* client = PushController::clientFrom(document->frame());
ASSERT(client);
Peter Beverloo 2014/10/29 11:25:07 We're going to be hitting this assert when using l
Michael van Ouwerkerk 2014/11/11 17:20:06 No, there is already an implementation of pushClie
RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);

Powered by Google App Engine
This is Rietveld 408576698