OLD | NEW |
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 |
40 DEFINE_TRACE(SensorProviderProxy) { | 47 DEFINE_TRACE(SensorProviderProxy) { |
41 visitor->trace(m_sensors); | 48 visitor->trace(m_sensors); |
42 Supplement<LocalFrame>::trace(visitor); | 49 Supplement<LocalFrame>::trace(visitor); |
43 } | 50 } |
44 | 51 |
45 SensorProxy* SensorProviderProxy::createSensor( | 52 SensorProxy* SensorProviderProxy::createSensor( |
46 device::mojom::blink::SensorType type, | 53 device::mojom::blink::SensorType type, |
| 54 RefPtr<SecurityOrigin> origin, |
47 std::unique_ptr<SensorReadingFactory> readingFactory) { | 55 std::unique_ptr<SensorReadingFactory> readingFactory) { |
48 DCHECK(!getSensor(type)); | 56 DCHECK(!getSensor(type)); |
49 | 57 |
50 SensorProxy* sensor = new SensorProxy(type, this, std::move(readingFactory)); | 58 SensorProxy* sensor = |
| 59 new SensorProxy(type, m_permissionService.get(), std::move(origin), this, |
| 60 std::move(readingFactory)); |
51 m_sensors.add(sensor); | 61 m_sensors.add(sensor); |
52 | |
53 return sensor; | 62 return sensor; |
54 } | 63 } |
55 | 64 |
56 SensorProxy* SensorProviderProxy::getSensor( | 65 SensorProxy* SensorProviderProxy::getSensor( |
57 device::mojom::blink::SensorType type) { | 66 device::mojom::blink::SensorType type) { |
58 for (SensorProxy* sensor : m_sensors) { | 67 for (SensorProxy* sensor : m_sensors) { |
59 // TODO(Mikhail) : Hash sensors by type for efficiency. | 68 // TODO(Mikhail) : Hash sensors by type for efficiency. |
60 if (sensor->type() == type) | 69 if (sensor->type() == type) |
61 return sensor; | 70 return sensor; |
62 } | 71 } |
63 | 72 |
64 return nullptr; | 73 return nullptr; |
65 } | 74 } |
66 | 75 |
67 void SensorProviderProxy::onSensorProviderConnectionError() { | 76 void SensorProviderProxy::onSensorProviderConnectionError() { |
68 if (!Platform::current()) { | 77 if (!Platform::current()) { |
69 // TODO(rockot): Clean this up once renderer shutdown sequence is fixed. | 78 // TODO(rockot): Clean this up once renderer shutdown sequence is fixed. |
70 return; | 79 return; |
71 } | 80 } |
72 | 81 |
73 m_sensorProvider.reset(); | 82 m_sensorProvider.reset(); |
74 for (SensorProxy* sensor : m_sensors) | 83 for (SensorProxy* sensor : m_sensors) |
75 sensor->handleSensorError(); | 84 sensor->handleSensorError(); |
76 } | 85 } |
77 | 86 |
78 } // namespace blink | 87 } // namespace blink |
OLD | NEW |