[Sensors] Reland: Align sensor reading updates and 'onchange' notification with rAF.

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

Index: third_party/WebKit/Source/modules/sensor/SensorProxy.cpp
diff --git a/third_party/WebKit/Source/modules/sensor/SensorProxy.cpp b/third_party/WebKit/Source/modules/sensor/SensorProxy.cpp
index 632a04d3180f840336bbddf579eab75d5fced190..0aad49f49fec6ca293ac1df2b1787a5be26ca9f6 100644
--- a/third_party/WebKit/Source/modules/sensor/SensorProxy.cpp
+++ b/third_party/WebKit/Source/modules/sensor/SensorProxy.cpp
@@ -4,9 +4,11 @@
 
 #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"
 
@@ -16,18 +18,18 @@ namespace blink {
 
 SensorProxy::SensorProxy(SensorType sensorType,
                          SensorProviderProxy* provider,
-                         Page* page,
+                         Document* document,
                          std::unique_ptr<SensorReadingFactory> readingFactory)
-    : PageVisibilityObserver(page),
+    : PageVisibilityObserver(document->page()),
       m_type(sensorType),
       m_mode(ReportingMode::CONTINUOUS),
       m_provider(provider),
       m_clientBinding(this),
       m_state(SensorProxy::Uninitialized),
       m_suspended(false),
+      m_document(document),
       m_readingFactory(std::move(readingFactory)),
-      m_maximumFrequency(0.0),
-      m_timer(this, &SensorProxy::onTimerFired) {}
+      m_maximumFrequency(0.0) {}
 
 SensorProxy::~SensorProxy() {}
 
@@ -36,6 +38,8 @@ void SensorProxy::dispose() {
 }
 
 DEFINE_TRACE(SensorProxy) {
+  visitor->trace(m_document);
+  visitor->trace(m_readingUpdater);
   visitor->trace(m_reading);
   visitor->trace(m_observers);
   visitor->trace(m_provider);
@@ -67,6 +71,10 @@ void SensorProxy::initialize() {
       m_type, mojo::MakeRequest(&m_sensor), callback);
 }
 
+bool SensorProxy::isActive() const {
+  return isInitialized() && !m_suspended && !m_frequenciesUsed.isEmpty();
+}
+
 void SensorProxy::addConfiguration(
     SensorConfigurationPtr configuration,
     std::unique_ptr<Function<void(bool)>> callback) {
@@ -93,12 +101,6 @@ void SensorProxy::suspend() {
 
   m_sensor->Suspend();
   m_suspended = true;
-
-  if (usesPollingTimer())
-    updatePollingStatus();
-
-  for (Observer* observer : m_observers)
-    observer->onSuspended();
 }
 
 void SensorProxy::resume() {
@@ -109,8 +111,8 @@ void SensorProxy::resume() {
   m_sensor->Resume();
   m_suspended = false;
 
-  if (usesPollingTimer())
-    updatePollingStatus();
+  if (isActive())
+    m_readingUpdater->start();
 }
 
 const SensorConfiguration* SensorProxy::defaultConfig() const {
@@ -118,10 +120,6 @@ const SensorConfiguration* SensorProxy::defaultConfig() const {
   return m_defaultConfig.get();
 }
 
-bool SensorProxy::usesPollingTimer() const {
-  return isInitialized() && (m_mode == ReportingMode::CONTINUOUS);
-}
-
 void SensorProxy::updateSensorReading() {
   DCHECK(isInitialized());
   DCHECK(m_readingFactory);
@@ -136,9 +134,14 @@ void SensorProxy::updateSensorReading() {
   }
 
   m_reading = m_readingFactory->createSensorReading(readingData);
+}
 
-  for (Observer* observer : m_observers)
-    observer->onSensorReadingChanged();
+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);
 }
 
 void SensorProxy::RaiseError() {
@@ -147,7 +150,8 @@ void SensorProxy::RaiseError() {
 
 void SensorProxy::SensorReadingChanged() {
   DCHECK_EQ(ReportingMode::ON_CHANGE, m_mode);
-  updateSensorReading();
+  if (isActive())
+    m_readingUpdater->start();
 }
 
 void SensorProxy::pageVisibilityChanged() {
@@ -169,12 +173,9 @@ void SensorProxy::handleSensorError(ExceptionCode code,
     return;
   }
 
-  if (usesPollingTimer()) {  // Stop polling.
-    m_frequenciesUsed.clear();
-    updatePollingStatus();
-  }
-
   m_state = Uninitialized;
+  m_frequenciesUsed.clear();
+
   // The m_sensor.reset() will release all callbacks and its bound parameters,
   // therefore, handleSensorError accepts messages by value.
   m_sensor.reset();
@@ -228,7 +229,10 @@ void SensorProxy::onSensorCreated(SensorInitParamsPtr params,
   m_sensor.set_connection_error_handler(
       convertToBaseCallback(std::move(errorCallback)));
 
+  m_readingUpdater = SensorReadingUpdater::create(this, m_mode);
+
   m_state = Initialized;
+
   for (Observer* observer : m_observers)
     observer->onSensorInitialized();
 }
@@ -237,9 +241,11 @@ void SensorProxy::onAddConfigurationCompleted(
     double frequency,
     std::unique_ptr<Function<void(bool)>> callback,
     bool result) {
-  if (usesPollingTimer() && result) {
+  if (result) {
     m_frequenciesUsed.append(frequency);
-    updatePollingStatus();
+    std::sort(m_frequenciesUsed.begin(), m_frequenciesUsed.end());
+    if (isActive())
+      m_readingUpdater->start();
   }
 
   (*callback)(result);
@@ -250,9 +256,6 @@ void SensorProxy::onRemoveConfigurationCompleted(double frequency,
   if (!result)
     DVLOG(1) << "Failure at sensor configuration removal";
 
-  if (!usesPollingTimer())
-    return;
-
   size_t index = m_frequenciesUsed.find(frequency);
   if (index == kNotFound) {
     // Could happen e.g. if 'handleSensorError' was called before.
@@ -260,7 +263,6 @@ void SensorProxy::onRemoveConfigurationCompleted(double frequency,
   }
 
   m_frequenciesUsed.remove(index);
-  updatePollingStatus();
 }
 
 bool SensorProxy::tryReadFromBuffer(device::SensorReading& result) {
@@ -276,28 +278,4 @@ bool SensorProxy::tryReadFromBuffer(device::SensorReading& result) {
   return true;
 }
 
-void SensorProxy::updatePollingStatus() {
-  DCHECK(usesPollingTimer());
-
-  if (m_suspended || m_frequenciesUsed.isEmpty()) {
-    m_timer.stop();
-    return;
-  }
-  // TODO(Mikhail): Consider using sorted queue instead of searching
-  // max element each time.
-  auto it =
-      std::max_element(m_frequenciesUsed.begin(), m_frequenciesUsed.end());
-  DCHECK_GT(*it, 0.0);
-
-  double repeatInterval = 1 / *it;
-  if (!m_timer.isActive() || m_timer.repeatInterval() != repeatInterval) {
-    updateSensorReading();
-    m_timer.startRepeating(repeatInterval, BLINK_FROM_HERE);
-  }
-}
-
-void SensorProxy::onTimerFired(TimerBase*) {
-  updateSensorReading();
-}
-
 }  // namespace blink