[Sensors] Remove SensorReading interfaces

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

 // 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.
 
 #ifndef SensorProxy_h
 #define SensorProxy_h
 
 #include "core/dom/ExceptionCode.h"
 #include "core/page/PageVisibilityObserver.h"
 #include "device/generic_sensor/public/cpp/sensor_reading.h"
 #include "device/generic_sensor/public/interfaces/sensor.mojom-blink.h"
 #include "device/generic_sensor/public/interfaces/sensor_provider.mojom-blink.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class SensorProviderProxy;
 class SensorReading;
-class SensorReadingFactory;
 class SensorReadingUpdater;
 
 // This class wraps 'Sensor' mojo interface and used by multiple
 // JS sensor instances of the same type (within a single frame).
 class SensorProxy final : public GarbageCollectedFinalized<SensorProxy>,
                           public device::mojom::blink::SensorClient,
                           public PageVisibilityObserver {
   USING_GARBAGE_COLLECTED_MIXIN(SensorProxy);
   USING_PRE_FINALIZER(SensorProxy, dispose);
   WTF_MAKE_NONCOPYABLE(SensorProxy);
@@ skipping 37 matching lines @@
                         std::unique_ptr<Function<void(bool)>>);
 
   void removeConfiguration(device::mojom::blink::SensorConfigurationPtr);
 
   void suspend();
   void resume();
 
   device::mojom::blink::SensorType type() const { return m_type; }
   device::mojom::blink::ReportingMode reportingMode() const { return m_mode; }
 
-  // The |SensorReading| instance which is shared between sensor instances
-  // of the same type.
   // Note: the returned value is reset after updateSensorReading() call.
-  SensorReading* sensorReading() const { return m_reading; }
+  const device::SensorReading& reading() const { return m_reading; }
 
   const device::mojom::blink::SensorConfiguration* defaultConfig() const;
 
   double maximumFrequency() const { return m_maximumFrequency; }
 
   Document* document() const;
   const WTF::Vector<double>& frequenciesUsed() const {
     return m_frequenciesUsed;
   }
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   friend class SensorProviderProxy;
   friend class SensorReadingUpdaterContinuous;
   friend class SensorReadingUpdaterOnChange;
-  SensorProxy(device::mojom::blink::SensorType,
-              SensorProviderProxy*,
-              Page*,
-              std::unique_ptr<SensorReadingFactory>);
+  SensorProxy(device::mojom::blink::SensorType, SensorProviderProxy*, Page*);
 
   // Updates sensor reading from shared buffer.
   void updateSensorReading();
   void notifySensorChanged(double timestamp);
 
   // device::mojom::blink::SensorClient overrides.
   void RaiseError() override;
   void SensorReadingChanged() override;
 
   // PageVisibilityObserver overrides.
@@ skipping 24 matching lines @@
 
   device::mojom::blink::SensorPtr m_sensor;
   device::mojom::blink::SensorConfigurationPtr m_defaultConfig;
   mojo::Binding<device::mojom::blink::SensorClient> m_clientBinding;
 
   enum State { Uninitialized, Initializing, Initialized };
   State m_state;
   mojo::ScopedSharedBufferHandle m_sharedBufferHandle;
   mojo::ScopedSharedBufferMapping m_sharedBuffer;
   bool m_suspended;
-  Member<SensorReading> m_reading;
-  std::unique_ptr<SensorReadingFactory> m_readingFactory;
+  device::SensorReading m_reading;
   double m_maximumFrequency;
 
   Member<SensorReadingUpdater> m_readingUpdater;
   WTF::Vector<double> m_frequenciesUsed;
   double m_lastRafTimestamp;
 
   using ReadingBuffer = device::SensorReadingSharedBuffer;
   static_assert(
       sizeof(ReadingBuffer) ==
           device::mojom::blink::SensorInitParams::kReadBufferSizeForTests,
       "Check reading buffer size for tests");
 };
 
 }  // namespace blink
 
 #endif  // SensorProxy_h