[Sensors] Remove SensorReading interfaces

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/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/sensor/SensorProviderProxy.h"
-#include "modules/sensor/SensorReading.h"
 #include "modules/sensor/SensorReadingUpdater.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/Platform.h"
 
 using namespace device::mojom::blink;
 
 namespace blink {
 
 SensorProxy::SensorProxy(SensorType sensorType,
                          SensorProviderProxy* provider,
-                         Page* page,
-                         std::unique_ptr<SensorReadingFactory> readingFactory)
+                         Page* page)
     : PageVisibilityObserver(page),
       m_type(sensorType),
       m_mode(ReportingMode::CONTINUOUS),
       m_provider(provider),
       m_clientBinding(this),
       m_state(SensorProxy::Uninitialized),
       m_suspended(false),
-      m_readingFactory(std::move(readingFactory)),
       m_maximumFrequency(0.0) {}
 
 SensorProxy::~SensorProxy() {}
 
 void SensorProxy::dispose() {
   m_clientBinding.Close();
 }
 
 DEFINE_TRACE(SensorProxy) {
   visitor->trace(m_readingUpdater);
-  visitor->trace(m_reading);
   visitor->trace(m_observers);
   visitor->trace(m_provider);
   PageVisibilityObserver::trace(visitor);
 }
 
 void SensorProxy::addObserver(Observer* observer) {
   if (!m_observers.contains(observer))
     m_observers.insert(observer);
 }
 
@@ skipping 65 matching lines @@
   DCHECK(isInitialized());
   return m_defaultConfig.get();
 }
 
 Document* SensorProxy::document() const {
   return m_provider->supplementable()->document();
 }
 
 void SensorProxy::updateSensorReading() {
   DCHECK(isInitialized());
-  DCHECK(m_readingFactory);
   int readAttempts = 0;
   const int kMaxReadAttemptsCount = 10;
   device::SensorReading readingData;
   while (!tryReadFromBuffer(readingData)) {
     if (++readAttempts == kMaxReadAttemptsCount) {
       handleSensorError();
       return;
     }
   }
 
-  m_reading = m_readingFactory->createSensorReading(readingData);
+  m_reading = readingData;
 }
 
 void SensorProxy::notifySensorChanged(double timestamp) {
   // This notification leads to sync 'onchange' event sending, so
   // we must cache m_observers as it can be modified within event handlers.
   auto copy = m_observers;
   for (Observer* observer : copy)
     observer->onSensorReadingChanged(timestamp);
 }
 
@@ skipping 21 matching lines @@
 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;
   m_frequenciesUsed.clear();
+  m_reading = device::SensorReading();
 
   // 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 75 matching lines @@
   const device::OneWriterSeqLock& seqlock = buffer->seqlock.value();
   auto version = seqlock.ReadBegin();
   auto readingData = buffer->reading;
   if (seqlock.ReadRetry(version))
     return false;
   result = readingData;
   return true;
 }
 
 }  // namespace blink