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 #ifndef CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_ | 5 #ifndef CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_ |
6 #define CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_ | 6 #define CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/callback_forward.h" |
11 #include "base/id_map.h" | 11 #include "base/id_map.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "content/child/permissions/permission_observers_registry.h" | |
14 #include "content/common/permission_service.mojom.h" | 15 #include "content/common/permission_service.mojom.h" |
15 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionCl ient.h" | 16 #include "third_party/WebKit/public/platform/modules/permissions/WebPermissionCl ient.h" |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 | 19 |
19 class ServiceRegistry; | 20 class ServiceRegistry; |
20 | 21 |
21 // The PermissionDispatcher is a layer between Blink and the Mojo | 22 // The PermissionDispatcher is a layer between Blink and the Mojo |
22 // PermissionService. It implements blink::WebPermissionClient. It is being used | 23 // PermissionService. It implements blink::WebPermissionClient. It is being used |
23 // from workers and frames independently. When called outside of the main | 24 // from workers and frames independently. When called outside of the main |
24 // thread, QueryPermissionForWorker is meant to be called. It will handle the | 25 // thread, QueryPermissionForWorker is meant to be called. It will handle the |
25 // thread jumping. | 26 // thread jumping. |
26 class PermissionDispatcher : public blink::WebPermissionClient { | 27 class PermissionDispatcher : public blink::WebPermissionClient, |
28 public PermissionObserversRegistry { | |
27 public: | 29 public: |
30 static bool IsObservable(blink::WebPermissionType type); | |
whywhat
2015/04/02 16:20:23
Comment?
mlamouri (slow - plz ping)
2015/04/02 17:02:43
done.
| |
31 | |
28 // The caller must guarantee that |service_registry| will have a lifetime | 32 // The caller must guarantee that |service_registry| will have a lifetime |
29 // larger than this instance of PermissionDispatcher. | 33 // larger than this instance of PermissionDispatcher. |
30 explicit PermissionDispatcher(ServiceRegistry* service_registry); | 34 explicit PermissionDispatcher(ServiceRegistry* service_registry); |
31 virtual ~PermissionDispatcher(); | 35 virtual ~PermissionDispatcher(); |
32 | 36 |
33 // blink::WebPermissionClient implementation. | 37 // blink::WebPermissionClient implementation. |
34 virtual void queryPermission(blink::WebPermissionType type, | 38 virtual void queryPermission(blink::WebPermissionType type, |
35 const blink::WebURL& origin, | 39 const blink::WebURL& origin, |
36 blink::WebPermissionQueryCallback* callback); | 40 blink::WebPermissionQueryCallback* callback); |
41 virtual void startListening(blink::WebPermissionType type, | |
42 const blink::WebURL& origin, | |
43 blink::WebPermissionObserver* observer); | |
44 virtual void stopListening(blink::WebPermissionObserver* observer); | |
37 | 45 |
46 // The following methods must be called by workers on the main thread. | |
38 void QueryPermissionForWorker(blink::WebPermissionType type, | 47 void QueryPermissionForWorker(blink::WebPermissionType type, |
39 const std::string& origin, | 48 const std::string& origin, |
40 blink::WebPermissionQueryCallback* callback, | 49 blink::WebPermissionQueryCallback* callback, |
41 int worker_thread_id); | 50 int worker_thread_id); |
51 void StartListeningForWorker( | |
whywhat
2015/04/02 16:20:24
why there's GetNextPermissionChangeForWorker but n
mlamouri (slow - plz ping)
2015/04/02 17:02:43
These three methods, as said in the comments are m
| |
52 blink::WebPermissionType type, | |
53 const std::string& origin, | |
54 int worker_thread_id, | |
55 const base::Callback<void(blink::WebPermissionStatus)>& callback); | |
56 void GetNextPermissionChangeForWorker( | |
57 blink::WebPermissionType type, | |
58 const std::string& origin, | |
59 blink::WebPermissionStatus status, | |
60 int worker_thread_id, | |
61 const base::Callback<void(blink::WebPermissionStatus)>& callback); | |
42 | 62 |
43 protected: | 63 private: |
64 // Called from the main thread in order to run the callback in the thread it | |
65 // was created on. | |
66 static void RunCallbackOnWorkerThread( | |
whywhat
2015/04/02 16:20:23
nit: I think the comment needs to clarify that it'
mlamouri (slow - plz ping)
2015/04/02 17:02:43
Done.
| |
67 blink::WebPermissionQueryCallback* callback, | |
68 scoped_ptr<blink::WebPermissionStatus> status); | |
69 | |
70 // Helper method that returns an initialized PermissionServicePtr. | |
71 PermissionServicePtr& GetPermissionServicePtr(); | |
72 | |
44 void QueryPermissionInternal(blink::WebPermissionType type, | 73 void QueryPermissionInternal(blink::WebPermissionType type, |
45 const std::string& origin, | 74 const std::string& origin, |
46 blink::WebPermissionQueryCallback* callback, | 75 blink::WebPermissionQueryCallback* callback, |
47 int worker_thread_id); | 76 int worker_thread_id); |
48 | 77 |
49 void OnQueryPermission(int request_id, PermissionStatus status); | 78 void OnQueryPermission(int request_id, PermissionStatus status); |
79 void OnPermissionChanged(blink::WebPermissionType type, | |
80 const std::string& origin, | |
81 blink::WebPermissionObserver* observer, | |
82 PermissionStatus status); | |
83 void OnPermissionChangedForWorker( | |
84 int worker_thread_id, | |
85 const base::Callback<void(blink::WebPermissionStatus)>& callback, | |
86 PermissionStatus status); | |
50 | 87 |
51 // Called from the main thread in order to run the callback in the thread it | 88 // Helper to be used on the main thread. |
52 // was created on. | 89 void GetNextPermissionChange(blink::WebPermissionType type, |
53 static void RunCallbackOnWorkerThread( | 90 const std::string& origin, |
54 blink::WebPermissionQueryCallback* callback, | 91 blink::WebPermissionObserver* observer, |
55 scoped_ptr<blink::WebPermissionStatus> status); | 92 PermissionStatus current_status); |
56 | 93 |
57 // Saves some basic information about the callback in order to be able to run | 94 // Saves some basic information about the callback in order to be able to run |
58 // it in the right thread. | 95 // it in the right thread. |
59 class CallbackInformation { | 96 class CallbackInformation { |
60 public: | 97 public: |
61 CallbackInformation(blink::WebPermissionQueryCallback* callback, | 98 CallbackInformation(blink::WebPermissionQueryCallback* callback, |
62 int worker_thread_id); | 99 int worker_thread_id); |
63 ~CallbackInformation(); | 100 ~CallbackInformation(); |
64 | 101 |
65 blink::WebPermissionQueryCallback* callback() const; | 102 blink::WebPermissionQueryCallback* callback() const; |
(...skipping 12 matching lines...) Expand all Loading... | |
78 | 115 |
79 ServiceRegistry* service_registry_; | 116 ServiceRegistry* service_registry_; |
80 PermissionServicePtr permission_service_; | 117 PermissionServicePtr permission_service_; |
81 | 118 |
82 DISALLOW_COPY_AND_ASSIGN(PermissionDispatcher); | 119 DISALLOW_COPY_AND_ASSIGN(PermissionDispatcher); |
83 }; | 120 }; |
84 | 121 |
85 } // namespace content | 122 } // namespace content |
86 | 123 |
87 #endif // CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_ | 124 #endif // CONTENT_CHILD_PERMISSIONS_PERMISSION_DISPATCHER_H_ |
OLD | NEW |