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

Unified Diff: content/browser/push_messaging/push_messaging_message_filter.cc

Issue 780783004: Push service may be null and must only be used on the UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years 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: content/browser/push_messaging/push_messaging_message_filter.cc
diff --git a/content/browser/push_messaging/push_messaging_message_filter.cc b/content/browser/push_messaging/push_messaging_message_filter.cc
index 415d8401b6c747dc26d0c2081199abcfb8cfdf1f..d28786fa9510db35adf0626ee1ffc30a36c12c67 100644
--- a/content/browser/push_messaging/push_messaging_message_filter.cc
+++ b/content/browser/push_messaging/push_messaging_message_filter.cc
@@ -206,6 +206,11 @@ void PushMessagingMessageFilter::DoPermissionStatusRequest(
int render_frame_id,
int callback_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ if (!service()) {
+ Send(new PushMessagingMsg_PermissionStatusFailure(render_frame_id,
+ callback_id));
+ return;
+ }
blink::WebPushPermissionStatus permission_value =
service()->GetPermissionStatus(
requesting_origin, render_process_id_, render_frame_id);
@@ -218,6 +223,10 @@ void PushMessagingMessageFilter::GetPermissionStatusOnUI(
const GURL& requesting_origin,
int request_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ if (!service()) {
+ Send(new PushMessagingMsg_GetPermissionStatusError(request_id));
+ return;
+ }
GURL embedding_origin = requesting_origin;
blink::WebPushPermissionStatus permission_status =
service()->GetPermissionStatus(requesting_origin, embedding_origin);
@@ -264,6 +273,7 @@ void PushMessagingMessageFilter::SendRegisterSuccess(
}
PushMessagingService* PushMessagingMessageFilter::service() {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!service_) {
RenderProcessHost* process_host =
RenderProcessHost::FromID(render_process_id_);
« no previous file with comments | « content/browser/push_messaging/push_messaging_message_filter.h ('k') | content/public/browser/push_messaging_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698