[Sensors] Remove SensorReading interfaces

third_party/WebKit/Source/modules/sensor/Sensor.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/Sensor.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/timing/DOMWindowPerformance.h"
+#include "core/timing/Performance.h"
 #include "device/generic_sensor/public/interfaces/sensor.mojom-blink.h"
 #include "modules/sensor/SensorErrorEvent.h"
 #include "modules/sensor/SensorProviderProxy.h"
-#include "modules/sensor/SensorReading.h"
 
 using namespace device::mojom::blink;
 
 namespace blink {
 
 Sensor::Sensor(ExecutionContext* executionContext,
                const SensorOptions& sensorOptions,
                ExceptionState& exceptionState,
                SensorType type)
     : ContextLifecycleObserver(executionContext),
@@ skipping 81 matching lines @@
       NOTREACHED();
   }
   return "idle";
 }
 
 // Getters
 String Sensor::state() const {
   return ToString(m_state);
 }
 
-SensorReading* Sensor::reading() const {
-  if (m_state != Sensor::SensorState::Activated)
-    return nullptr;
+DOMHighResTimeStamp Sensor::timestamp(ScriptState* scriptState,
+                                      bool& isNull) const {
+  if (!canReturnReadings()) {
+    isNull = true;
+    return 0.0;
+  }
+
+  LocalDOMWindow* window = scriptState->domWindow();
+  if (!window) {
+    isNull = true;
+    return 0.0;
+  }
+
+  Performance* performance = DOMWindowPerformance::performance(*window);
+  DCHECK(performance);
   DCHECK(m_sensorProxy);
-  return m_sensorProxy->sensorReading();
+  isNull = false;
+
+  return performance->monotonicTimeToDOMHighResTimeStamp(
+      m_sensorProxy->reading().timestamp);
 }
 
 DEFINE_TRACE(Sensor) {
   visitor->trace(m_sensorProxy);
   ActiveScriptWrappable::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
   EventTargetWithInlineData::trace(visitor);
 }
 
 bool Sensor::hasPendingActivity() const {
@@ skipping 13 matching lines @@
                          ? m_sensorOptions.frequency()
                          : defaultFrequency;
 
   if (frequency > maximumFrequency)
     frequency = maximumFrequency;
 
   result->frequency = frequency;
   return result;
 }
 
+double Sensor::readingValue(int index, bool& isNull) const {
+  if (!canReturnReadings()) {
+    isNull = true;
+    return 0.0;
+  }
+  DCHECK(m_sensorProxy);
+  DCHECK(index >= 0 && index < device::SensorReading::kValuesCount);
+  return m_sensorProxy->reading().values[index];
+}
+
 void Sensor::initSensorProxyIfNeeded() {
   if (m_sensorProxy)
     return;
 
   Document* document = toDocument(getExecutionContext());
   if (!document || !document->frame())
     return;
 
   auto provider = SensorProviderProxy::from(document->frame());
   m_sensorProxy = provider->getSensorProxy(m_type);
 
-  if (!m_sensorProxy) {
-    m_sensorProxy = provider->createSensorProxy(m_type, document->page(),
-                                                createSensorReadingFactory());
-  }
+  if (!m_sensorProxy)
+    m_sensorProxy = provider->createSensorProxy(m_type, document->page());
 }
 
 void Sensor::contextDestroyed(ExecutionContext*) {
   if (m_state == Sensor::SensorState::Activated ||
       m_state == Sensor::SensorState::Activating)
     stopListening();
 }
 
 void Sensor::onSensorInitialized() {
   if (m_state != Sensor::SensorState::Activating)
@@ skipping 96 matching lines @@
         DOMException::create(code, sanitizedMessage, unsanitizedMessage);
     getExecutionContext()->postTask(
         TaskType::Sensor, BLINK_FROM_HERE,
         createSameThreadTask(&Sensor::notifyError, wrapWeakPersistent(this),
                              wrapPersistent(error)));
   }
 }
 
 void Sensor::notifySensorReadingChanged() {
   DCHECK(m_sensorProxy);
-  DCHECK(m_sensorProxy->sensorReading());
 
-  if (m_sensorProxy->sensorReading()->isReadingUpdated(m_storedData)) {
-    m_storedData = m_sensorProxy->sensorReading()->data();
+  if (m_sensorProxy->reading().timestamp != m_storedData.timestamp) {
+    m_storedData = m_sensorProxy->reading();
     dispatchEvent(Event::create(EventTypeNames::change));
   }
 }
 
 void Sensor::notifyOnActivate() {
   dispatchEvent(Event::create(EventTypeNames::activate));
 }
 
 void Sensor::notifyError(DOMException* error) {
   dispatchEvent(
       SensorErrorEvent::create(EventTypeNames::error, std::move(error)));
 }
 
+bool Sensor::canReturnReadings() const {
+  if (m_state != Sensor::SensorState::Activated)
+    return false;
+  DCHECK(m_sensorProxy);
+  return m_sensorProxy->reading().timestamp != 0.0;
+}
+
 }  // namespace blink