[Sensors] Align sensor reading attribute implementation with the specification

third_party/WebKit/Source/modules/sensor/SensorProxy.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/sensor/SensorProxy.h"
 
 #include "core/frame/LocalFrame.h"
 #include "modules/sensor/SensorProviderProxy.h"
+#include "modules/sensor/SensorReading.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/Platform.h"
 
 using namespace device::mojom::blink;
 
 namespace blink {
 
-SensorProxy::SensorProxy(SensorType sensorType, SensorProviderProxy* provider)
+SensorProxy::SensorProxy(SensorType sensorType,
+                         SensorProviderProxy* provider,
+                         std::unique_ptr<SensorReadingFactory> readingFactory)
     : m_type(sensorType),
       m_mode(ReportingMode::CONTINUOUS),
       m_provider(provider),
       m_clientBinding(this),
       m_state(SensorProxy::Uninitialized),
-      m_reading(),
-      m_suspended(false) {}
+      m_suspended(false),
+      m_readingFactory(std::move(readingFactory)) {}
 
 SensorProxy::~SensorProxy() {}
 
 void SensorProxy::dispose() {
   m_clientBinding.Close();
 }
 
 DEFINE_TRACE(SensorProxy) {
+  visitor->trace(m_reading);
   visitor->trace(m_observers);
   visitor->trace(m_provider);
 }
 
 void SensorProxy::addObserver(Observer* observer) {
   if (!m_observers.contains(observer))
     m_observers.add(observer);
 }
 
 void SensorProxy::removeObserver(Observer* observer) {
@@ skipping 49 matching lines @@
   m_sensor->Resume();
   m_suspended = false;
 }
 
 const device::mojom::blink::SensorConfiguration* SensorProxy::defaultConfig()
     const {
   DCHECK(isInitialized());
   return m_defaultConfig.get();
 }
 
-void SensorProxy::updateInternalReading() {
+void SensorProxy::updateSensorReading() {
   DCHECK(isInitialized());
+  DCHECK(m_readingFactory);
   int readAttempts = 0;
   const int kMaxReadAttemptsCount = 10;
-  while (!tryReadFromBuffer()) {
+  device::SensorReading readingData;
+  while (!tryReadFromBuffer(readingData)) {
     if (++readAttempts == kMaxReadAttemptsCount) {
       handleSensorError();
       return;
     }
   }
+
+  m_reading = m_readingFactory->createSensorReading(readingData);
 }
 
 void SensorProxy::RaiseError() {
   handleSensorError();
 }
 
 void SensorProxy::SensorReadingChanged() {
   for (Observer* observer : m_observers)
     observer->onSensorReadingChanged();
 }
 
 void SensorProxy::handleSensorError(ExceptionCode code,
                                     String sanitizedMessage,
                                     String unsanitizedMessage) {
   if (!Platform::current()) {
     // TODO(rockot): Remove this hack once renderer shutdown sequence is fixed.
     return;
   }
 
   m_state = Uninitialized;
   // The m_sensor.reset() will release all callbacks and its bound parameters,
   // therefore, handleSensorError accepts messages by value.
   m_sensor.reset();
   m_sharedBuffer.reset();
   m_sharedBufferHandle.reset();
   m_defaultConfig.reset();
   m_clientBinding.Close();
+  m_reading = nullptr;
 
   for (Observer* observer : m_observers)
     observer->onSensorError(code, sanitizedMessage, unsanitizedMessage);
 }
 
 void SensorProxy::onSensorCreated(SensorInitParamsPtr params,
                                   SensorClientRequest clientRequest) {
   DCHECK_EQ(Initializing, m_state);
   if (!params) {
     handleSensorError(NotFoundError, "Sensor is not present on the platform.");
@@ skipping 27 matching lines @@
       WTF::bind(&SensorProxy::handleSensorError, wrapWeakPersistent(this),
                 UnknownError, String("Internal error"), String());
   m_sensor.set_connection_error_handler(
       convertToBaseCallback(std::move(errorCallback)));
 
   m_state = Initialized;
   for (Observer* observer : m_observers)
     observer->onSensorInitialized();
 }
 
-bool SensorProxy::tryReadFromBuffer() {
+bool SensorProxy::tryReadFromBuffer(device::SensorReading& result) {
   DCHECK(isInitialized());
   const ReadingBuffer* buffer =
       static_cast<const ReadingBuffer*>(m_sharedBuffer.get());
   const device::OneWriterSeqLock& seqlock = buffer->seqlock.value();
   auto version = seqlock.ReadBegin();
-  auto reading = buffer->reading;
+  auto readingData = buffer->reading;
   if (seqlock.ReadRetry(version))
     return false;
-  m_reading = reading;
+  result = readingData;
   return true;
 }
 
 }  // namespace blink