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

Side by Side Diff: third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp

Issue 2458453002: [sensors] Add Permission guard to the generic sensor apis.
Patch Set: Handle Denied and Ask differently, add permissionService.reset() Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "modules/sensor/SensorProviderProxy.h" 5 #include "modules/sensor/SensorProviderProxy.h"
6 6
7 #include "modules/sensor/SensorProxy.h" 7 #include "modules/sensor/SensorProxy.h"
8 #include "modules/sensor/SensorReading.h" 8 #include "modules/sensor/SensorReading.h"
9 #include "platform/mojo/MojoHelper.h" 9 #include "platform/mojo/MojoHelper.h"
10 #include "public/platform/InterfaceProvider.h" 10 #include "public/platform/InterfaceProvider.h"
11 #include "public/platform/Platform.h" 11 #include "public/platform/Platform.h"
12 12
13 namespace blink { 13 namespace blink {
14 14
15 // SensorProviderProxy 15 // SensorProviderProxy
16 SensorProviderProxy::SensorProviderProxy(LocalFrame* frame) { 16 SensorProviderProxy::SensorProviderProxy(LocalFrame* frame) {
17 frame->interfaceProvider()->getInterface(mojo::GetProxy(&m_sensorProvider)); 17 frame->interfaceProvider()->getInterface(mojo::GetProxy(&m_sensorProvider));
18 m_sensorProvider.set_connection_error_handler(convertToBaseCallback( 18 m_sensorProvider.set_connection_error_handler(convertToBaseCallback(
19 WTF::bind(&SensorProviderProxy::onSensorProviderConnectionError, 19 WTF::bind(&SensorProviderProxy::onSensorProviderConnectionError,
20 wrapWeakPersistent(this)))); 20 wrapWeakPersistent(this))));
21
22 // Get permission service.
23 frame->interfaceProvider()->getInterface(
24 mojo::GetProxy(&m_permissionService));
25 m_permissionService.set_connection_error_handler(convertToBaseCallback(
26 WTF::bind(&SensorProviderProxy::onSensorProviderConnectionError,
27 wrapWeakPersistent(this))));
21 } 28 }
22 29
23 const char* SensorProviderProxy::supplementName() { 30 const char* SensorProviderProxy::supplementName() {
24 return "SensorProvider"; 31 return "SensorProvider";
25 } 32 }
26 33
27 SensorProviderProxy* SensorProviderProxy::from(LocalFrame* frame) { 34 SensorProviderProxy* SensorProviderProxy::from(LocalFrame* frame) {
28 DCHECK(frame); 35 DCHECK(frame);
29 SensorProviderProxy* result = static_cast<SensorProviderProxy*>( 36 SensorProviderProxy* result = static_cast<SensorProviderProxy*>(
30 Supplement<LocalFrame>::from(*frame, supplementName())); 37 Supplement<LocalFrame>::from(*frame, supplementName()));
31 if (!result) { 38 if (!result) {
32 result = new SensorProviderProxy(frame); 39 result = new SensorProviderProxy(frame);
33 Supplement<LocalFrame>::provideTo(*frame, supplementName(), result); 40 Supplement<LocalFrame>::provideTo(*frame, supplementName(), result);
34 } 41 }
35 return result; 42 return result;
36 } 43 }
37 44
38 SensorProviderProxy::~SensorProviderProxy() {} 45 SensorProviderProxy::~SensorProviderProxy() {}
39 46
47 void SensorProviderProxy::resetPermissionService() {
48 m_permissionService.reset();
49 }
50
40 DEFINE_TRACE(SensorProviderProxy) { 51 DEFINE_TRACE(SensorProviderProxy) {
41 visitor->trace(m_sensors); 52 visitor->trace(m_sensors);
42 Supplement<LocalFrame>::trace(visitor); 53 Supplement<LocalFrame>::trace(visitor);
43 } 54 }
44 55
45 SensorProxy* SensorProviderProxy::createSensor( 56 SensorProxy* SensorProviderProxy::createSensor(
46 device::mojom::blink::SensorType type, 57 device::mojom::blink::SensorType type,
58 RefPtr<SecurityOrigin> origin,
47 std::unique_ptr<SensorReadingFactory> readingFactory) { 59 std::unique_ptr<SensorReadingFactory> readingFactory) {
48 DCHECK(!getSensor(type)); 60 DCHECK(!getSensor(type));
49 61
50 SensorProxy* sensor = new SensorProxy(type, this, std::move(readingFactory)); 62 SensorProxy* sensor =
63 new SensorProxy(type, m_permissionService.get(), std::move(origin), this,
64 std::move(readingFactory));
51 m_sensors.add(sensor); 65 m_sensors.add(sensor);
52
53 return sensor; 66 return sensor;
54 } 67 }
55 68
56 SensorProxy* SensorProviderProxy::getSensor( 69 SensorProxy* SensorProviderProxy::getSensor(
57 device::mojom::blink::SensorType type) { 70 device::mojom::blink::SensorType type) {
58 for (SensorProxy* sensor : m_sensors) { 71 for (SensorProxy* sensor : m_sensors) {
59 // TODO(Mikhail) : Hash sensors by type for efficiency. 72 // TODO(Mikhail) : Hash sensors by type for efficiency.
60 if (sensor->type() == type) 73 if (sensor->type() == type)
61 return sensor; 74 return sensor;
62 } 75 }
63 76
64 return nullptr; 77 return nullptr;
65 } 78 }
66 79
67 void SensorProviderProxy::onSensorProviderConnectionError() { 80 void SensorProviderProxy::onSensorProviderConnectionError() {
68 if (!Platform::current()) { 81 if (!Platform::current()) {
69 // TODO(rockot): Clean this up once renderer shutdown sequence is fixed. 82 // TODO(rockot): Clean this up once renderer shutdown sequence is fixed.
70 return; 83 return;
71 } 84 }
72 85
86 m_permissionService.reset();
73 m_sensorProvider.reset(); 87 m_sensorProvider.reset();
74 for (SensorProxy* sensor : m_sensors) 88 for (SensorProxy* sensor : m_sensors)
75 sensor->handleSensorError(); 89 sensor->handleSensorError();
76 } 90 }
77 91
78 } // namespace blink 92 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698