| OLD | NEW |
| 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/child/permissions/permission_manager_thread_proxy.h" | 5 #include "content/child/permissions/permission_dispatcher_thread_proxy.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/threading/thread_local.h" | 12 #include "base/threading/thread_local.h" |
| 13 #include "content/child/permissions/permission_manager.h" | 13 #include "content/child/permissions/permission_dispatcher.h" |
| 14 #include "content/child/worker_task_runner.h" | 14 #include "content/child/worker_task_runner.h" |
| 15 #include "third_party/WebKit/public/platform/WebURL.h" | 15 #include "third_party/WebKit/public/platform/WebURL.h" |
| 16 | 16 |
| 17 using base::LazyInstance; | 17 using base::LazyInstance; |
| 18 using base::ThreadLocalPointer; | 18 using base::ThreadLocalPointer; |
| 19 | 19 |
| 20 namespace content { | 20 namespace content { |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 LazyInstance<ThreadLocalPointer<PermissionManagerThreadProxy>>::Leaky | 24 LazyInstance<ThreadLocalPointer<PermissionDispatcherThreadProxy>>::Leaky |
| 25 g_permission_manager_tls = LAZY_INSTANCE_INITIALIZER; | 25 g_permission_dispatcher_tls = LAZY_INSTANCE_INITIALIZER; |
| 26 | 26 |
| 27 } // anonymous namespace | 27 } // anonymous namespace |
| 28 | 28 |
| 29 PermissionManagerThreadProxy* | 29 PermissionDispatcherThreadProxy* |
| 30 PermissionManagerThreadProxy::GetThreadInstance( | 30 PermissionDispatcherThreadProxy::GetThreadInstance( |
| 31 base::SingleThreadTaskRunner* main_thread_task_runner, | 31 base::SingleThreadTaskRunner* main_thread_task_runner, |
| 32 PermissionManager* permissions_manager) { | 32 PermissionDispatcher* permission_dispatcher) { |
| 33 if (g_permission_manager_tls.Pointer()->Get()) | 33 if (g_permission_dispatcher_tls.Pointer()->Get()) |
| 34 return g_permission_manager_tls.Pointer()->Get(); | 34 return g_permission_dispatcher_tls.Pointer()->Get(); |
| 35 | 35 |
| 36 PermissionManagerThreadProxy* instance = | 36 PermissionDispatcherThreadProxy* instance = |
| 37 new PermissionManagerThreadProxy(main_thread_task_runner, | 37 new PermissionDispatcherThreadProxy(main_thread_task_runner, |
| 38 permissions_manager); | 38 permission_dispatcher); |
| 39 DCHECK(WorkerTaskRunner::Instance()->CurrentWorkerId()); | 39 DCHECK(WorkerTaskRunner::Instance()->CurrentWorkerId()); |
| 40 WorkerTaskRunner::Instance()->AddStopObserver(instance); | 40 WorkerTaskRunner::Instance()->AddStopObserver(instance); |
| 41 return instance; | 41 return instance; |
| 42 } | 42 } |
| 43 | 43 |
| 44 PermissionManagerThreadProxy::PermissionManagerThreadProxy( | 44 PermissionDispatcherThreadProxy::PermissionDispatcherThreadProxy( |
| 45 base::SingleThreadTaskRunner* main_thread_task_runner, | 45 base::SingleThreadTaskRunner* main_thread_task_runner, |
| 46 PermissionManager* permissions_manager) | 46 PermissionDispatcher* permission_dispatcher) |
| 47 : main_thread_task_runner_(main_thread_task_runner), | 47 : main_thread_task_runner_(main_thread_task_runner), |
| 48 permissions_manager_(permissions_manager) { | 48 permission_dispatcher_(permission_dispatcher) { |
| 49 g_permission_manager_tls.Pointer()->Set(this); | 49 g_permission_dispatcher_tls.Pointer()->Set(this); |
| 50 } | 50 } |
| 51 | 51 |
| 52 PermissionManagerThreadProxy::~PermissionManagerThreadProxy() { | 52 PermissionDispatcherThreadProxy::~PermissionDispatcherThreadProxy() { |
| 53 g_permission_manager_tls.Pointer()->Set(nullptr); | 53 g_permission_dispatcher_tls.Pointer()->Set(nullptr); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void PermissionManagerThreadProxy::queryPermission( | 56 void PermissionDispatcherThreadProxy::queryPermission( |
| 57 blink::WebPermissionType type, | 57 blink::WebPermissionType type, |
| 58 const blink::WebURL& origin, | 58 const blink::WebURL& origin, |
| 59 blink::WebPermissionQueryCallback* callback) { | 59 blink::WebPermissionQueryCallback* callback) { |
| 60 main_thread_task_runner_->PostTask( | 60 main_thread_task_runner_->PostTask( |
| 61 FROM_HERE, | 61 FROM_HERE, |
| 62 base::Bind(&PermissionManager::QueryPermissionForWorker, | 62 base::Bind(&PermissionDispatcher::QueryPermissionForWorker, |
| 63 base::Unretained(permissions_manager_), | 63 base::Unretained(permission_dispatcher_), |
| 64 type, | 64 type, |
| 65 origin.string().utf8(), | 65 origin.string().utf8(), |
| 66 base::Unretained(callback), | 66 base::Unretained(callback), |
| 67 WorkerTaskRunner::Instance()->CurrentWorkerId())); | 67 WorkerTaskRunner::Instance()->CurrentWorkerId())); |
| 68 } | 68 } |
| 69 | 69 |
| 70 void PermissionManagerThreadProxy::OnWorkerRunLoopStopped() { | 70 void PermissionDispatcherThreadProxy::OnWorkerRunLoopStopped() { |
| 71 delete this; | 71 delete this; |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace content | 74 } // namespace content |
| OLD | NEW |