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 243c8f567abd3b83ac192d914e82462333631f7b..b2309114253196c350bd7826deba6e89434ab4e1 100644 |
--- a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
+++ b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
@@ -38,24 +38,26 @@ SensorProviderProxy* SensorProviderProxy::from(LocalFrame* frame) { |
SensorProviderProxy::~SensorProviderProxy() {} |
DEFINE_TRACE(SensorProviderProxy) { |
- visitor->trace(m_sensors); |
+ visitor->trace(m_sensorProxies); |
Supplement<LocalFrame>::trace(visitor); |
} |
-SensorProxy* SensorProviderProxy::createSensor( |
+SensorProxy* SensorProviderProxy::createSensorProxy( |
device::mojom::blink::SensorType type, |
+ Page* page, |
std::unique_ptr<SensorReadingFactory> readingFactory) { |
- DCHECK(!getSensor(type)); |
+ DCHECK(!getSensorProxy(type)); |
- SensorProxy* sensor = new SensorProxy(type, this, std::move(readingFactory)); |
- m_sensors.add(sensor); |
+ SensorProxy* sensor = |
+ new SensorProxy(type, this, page, std::move(readingFactory)); |
+ m_sensorProxies.add(sensor); |
return sensor; |
} |
-SensorProxy* SensorProviderProxy::getSensor( |
+SensorProxy* SensorProviderProxy::getSensorProxy( |
device::mojom::blink::SensorType type) { |
- for (SensorProxy* sensor : m_sensors) { |
+ for (SensorProxy* sensor : m_sensorProxies) { |
// TODO(Mikhail) : Hash sensors by type for efficiency. |
if (sensor->type() == type) |
return sensor; |
@@ -71,7 +73,7 @@ void SensorProviderProxy::onSensorProviderConnectionError() { |
} |
m_sensorProvider.reset(); |
- for (SensorProxy* sensor : m_sensors) |
+ for (SensorProxy* sensor : m_sensorProxies) |
sensor->handleSensorError(); |
} |