Index: third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
diff --git a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
index b2309114253196c350bd7826deba6e89434ab4e1..5a5f28e803216891af5e33df0521e9f0cb98a3ed 100644 |
--- a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
+++ b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
@@ -18,6 +18,13 @@ SensorProviderProxy::SensorProviderProxy(LocalFrame* frame) { |
m_sensorProvider.set_connection_error_handler(convertToBaseCallback( |
WTF::bind(&SensorProviderProxy::onSensorProviderConnectionError, |
wrapWeakPersistent(this)))); |
+ |
+ // Get permission service. |
+ frame->interfaceProvider()->getInterface( |
+ mojo::GetProxy(&m_permissionService)); |
+ m_permissionService.set_connection_error_handler(convertToBaseCallback( |
+ WTF::bind(&SensorProviderProxy::onSensorProviderConnectionError, |
+ wrapWeakPersistent(this)))); |
} |
const char* SensorProviderProxy::supplementName() { |
@@ -45,11 +52,13 @@ DEFINE_TRACE(SensorProviderProxy) { |
SensorProxy* SensorProviderProxy::createSensorProxy( |
device::mojom::blink::SensorType type, |
Page* page, |
+ RefPtr<SecurityOrigin> origin, |
std::unique_ptr<SensorReadingFactory> readingFactory) { |
DCHECK(!getSensorProxy(type)); |
SensorProxy* sensor = |
- new SensorProxy(type, this, page, std::move(readingFactory)); |
+ new SensorProxy(type, m_permissionService.get(), std::move(origin), this, |
+ page, std::move(readingFactory)); |
m_sensorProxies.add(sensor); |
return sensor; |
@@ -72,6 +81,7 @@ void SensorProviderProxy::onSensorProviderConnectionError() { |
return; |
} |
+ m_permissionService.reset(); |
m_sensorProvider.reset(); |
for (SensorProxy* sensor : m_sensorProxies) |
sensor->handleSensorError(); |