Index: third_party/WebKit/Source/modules/sensor/SensorProxy.h |
diff --git a/third_party/WebKit/Source/modules/sensor/SensorProxy.h b/third_party/WebKit/Source/modules/sensor/SensorProxy.h |
index d49e087da0bcbb4775e7de6748aef1f325f2f620..fccb7d18671087e022a3a340e7b5c9ab65f50991 100644 |
--- a/third_party/WebKit/Source/modules/sensor/SensorProxy.h |
+++ b/third_party/WebKit/Source/modules/sensor/SensorProxy.h |
@@ -59,9 +59,10 @@ public: |
double timestamp; |
double reading[3]; |
}; |
- static_assert(sizeof(Reading) == device::mojom::blink::SensorReadBuffer::kReadBufferSize, "Check reading size"); |
+ static_assert(sizeof(Reading) == device::mojom::blink::SensorInitParams::kReadBufferSize, "Check reading size"); |
const Reading& reading() const { return m_reading; } |
+ const device::mojom::blink::SensorConfiguration* defaultConfig() const { return m_defaultConfig.get(); } |
shalamov
2016/09/13 10:52:59
DCHECK(isInitialized()); ?
|
// Updates internal reading from shared buffer. |
void updateInternalReading(); |
@@ -79,7 +80,7 @@ private: |
// Generic handler for a fatal error. |
void handleSensorError(); |
- void onSensorCreated(device::mojom::blink::SensorReadBufferPtr, device::mojom::blink::SensorClientRequest); |
+ void onSensorCreated(device::mojom::blink::SensorInitParamsPtr, device::mojom::blink::SensorClientRequest); |
device::mojom::blink::SensorType m_type; |
device::mojom::blink::ReportingMode m_mode; |
@@ -88,7 +89,9 @@ private: |
ObserversSet m_observers; |
device::mojom::blink::SensorPtr m_sensor; |
+ device::mojom::blink::SensorConfigurationPtr m_defaultConfig; |
mojo::Binding<device::mojom::blink::SensorClient> m_clientBinding; |
+ |
enum State { |
Uninitialized, |
Initializing, |