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

Side by Side Diff: content/renderer/media/media_permission_dispatcher.cc

Issue 1464183002: media: Simplify MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/media_permission_dispatcher.h" 5 #include "content/renderer/media/media_permission_dispatcher.h"
6 6
7 #include "base/bind.h"
7 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h"
11 #include "content/public/common/service_registry.h"
12 #include "content/public/renderer/render_frame.h"
13 #include "media/base/bind_to_current_loop.h"
14 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
15 #include "url/gurl.h"
16
17 namespace {
18
19 using Type = media::MediaPermission::Type;
20
21 content::PermissionName MediaPermissionTypeToPermissionName(Type type) {
22 switch (type) {
23 case Type::PROTECTED_MEDIA_IDENTIFIER:
24 return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
25 case Type::AUDIO_CAPTURE:
26 return content::PermissionName::AUDIO_CAPTURE;
27 case Type::VIDEO_CAPTURE:
28 return content::PermissionName::VIDEO_CAPTURE;
29 }
30 NOTREACHED();
31 return content::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
32 }
33
34 } // namespace
8 35
9 namespace content { 36 namespace content {
10 37
11 MediaPermissionDispatcher::MediaPermissionDispatcher() : next_request_id_(0) {} 38 MediaPermissionDispatcher::MediaPermissionDispatcher(RenderFrame* render_frame)
39 : RenderFrameObserver(render_frame),
40 task_runner_(base::ThreadTaskRunnerHandle::Get()),
41 next_request_id_(0),
42 weak_factory_(this) {
43 weak_ptr_ = weak_factory_.GetWeakPtr();
44 }
12 45
13 MediaPermissionDispatcher::~MediaPermissionDispatcher() { 46 MediaPermissionDispatcher::~MediaPermissionDispatcher() {
14 DCHECK(thread_checker_.CalledOnValidThread()); 47 DCHECK(task_runner_->RunsTasksOnCurrentThread());
48
15 // Fire all pending callbacks with |false|. 49 // Fire all pending callbacks with |false|.
16 for (auto& request : requests_) 50 for (auto& request : requests_)
17 request.second.Run(false); 51 request.second.Run(false);
52 }
18 53
19 requests_.clear(); 54 void MediaPermissionDispatcher::HasPermission(
55 Type type,
56 const GURL& security_origin,
57 const PermissionStatusCB& permission_status_cb) {
58 if (!task_runner_->RunsTasksOnCurrentThread()) {
59 task_runner_->PostTask(
60 FROM_HERE, base::Bind(&MediaPermissionDispatcher::HasPermission,
61 weak_ptr_, type, security_origin,
62 media::BindToCurrentLoop(permission_status_cb)));
63 return;
64 }
65
66 DCHECK(task_runner_->RunsTasksOnCurrentThread());
67
68 if (!permission_service_) {
69 render_frame()->GetServiceRegistry()->ConnectToRemoteService(
70 mojo::GetProxy(&permission_service_));
71 }
72
73 int request_id = RegisterCallback(permission_status_cb);
74 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id;
75
76 permission_service_->HasPermission(
77 MediaPermissionTypeToPermissionName(type), security_origin.spec(),
78 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_,
79 request_id));
80 }
81
82 void MediaPermissionDispatcher::RequestPermission(
83 Type type,
84 const GURL& security_origin,
85 const PermissionStatusCB& permission_status_cb) {
86 if (!task_runner_->RunsTasksOnCurrentThread()) {
87 task_runner_->PostTask(
88 FROM_HERE, base::Bind(&MediaPermissionDispatcher::RequestPermission,
89 weak_ptr_, type, security_origin,
90 media::BindToCurrentLoop(permission_status_cb)));
91 return;
92 }
93
94 DCHECK(task_runner_->RunsTasksOnCurrentThread());
95
96 if (!permission_service_) {
97 render_frame()->GetServiceRegistry()->ConnectToRemoteService(
98 mojo::GetProxy(&permission_service_));
99 }
100
101 int request_id = RegisterCallback(permission_status_cb);
102 DVLOG(2) << __FUNCTION__ << ": request ID " << request_id;
103
104 permission_service_->RequestPermission(
105 MediaPermissionTypeToPermissionName(type), security_origin.spec(),
106 blink::WebUserGestureIndicator::isProcessingUserGesture(),
107 base::Bind(&MediaPermissionDispatcher::OnPermissionStatus, weak_ptr_,
108 request_id));
20 } 109 }
21 110
22 uint32_t MediaPermissionDispatcher::RegisterCallback( 111 uint32_t MediaPermissionDispatcher::RegisterCallback(
23 const PermissionStatusCB& permission_status_cb) { 112 const PermissionStatusCB& permission_status_cb) {
24 DCHECK(thread_checker_.CalledOnValidThread()); 113 DCHECK(task_runner_->RunsTasksOnCurrentThread());
114
25 uint32_t request_id = next_request_id_++; 115 uint32_t request_id = next_request_id_++;
26 DCHECK(!requests_.count(request_id)); 116 DCHECK(!requests_.count(request_id));
27 requests_[request_id] = permission_status_cb; 117 requests_[request_id] = permission_status_cb;
118
28 return request_id; 119 return request_id;
29 } 120 }
30 121
31 void MediaPermissionDispatcher::DeliverResult(uint32_t request_id, 122 void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id,
32 bool granted) { 123 PermissionStatus status) {
33 DCHECK(thread_checker_.CalledOnValidThread()); 124 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
34 DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << granted << ")"; 125 DCHECK(task_runner_->RunsTasksOnCurrentThread());
35 126
36 RequestMap::iterator iter = requests_.find(request_id); 127 RequestMap::iterator iter = requests_.find(request_id);
37 if (iter == requests_.end()) { 128 DCHECK(iter != requests_.end()) << "Request not found.";
38 DVLOG(2) << "Request not found.";
39 return;
40 }
41 129
42 PermissionStatusCB permission_status_cb = iter->second; 130 PermissionStatusCB permission_status_cb = iter->second;
43 requests_.erase(iter); 131 requests_.erase(iter);
44 132
45 permission_status_cb.Run(granted); 133 permission_status_cb.Run(status == PermissionStatus::GRANTED);
46 } 134 }
47 135
48 } // namespace content 136 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_permission_dispatcher.h ('k') | content/renderer/media/media_permission_dispatcher_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698