[Sensors] Consider maximum supported frequency

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/inspector/ConsoleMessage.h"
@@ skipping 120 matching lines @@
   EventTargetWithInlineData::trace(visitor);
 }
 
 bool Sensor::hasPendingActivity() const {
   if (m_state == Sensor::SensorState::IDLE ||
       m_state == Sensor::SensorState::ERRORED)
     return false;
   return hasEventListeners();
 }
 
+auto Sensor::createSensorConfig() -> SensorConfigurationPtr {
+  auto result = SensorConfiguration::New();
+
+  double defaultFrequency = m_sensorProxy->defaultConfig()->frequency;
+  double maximumFrequency = m_sensorProxy->maximumFrequency();
+
+  double frequency = m_sensorOptions.hasFrequency()
+                         ? m_sensorOptions.frequency()
+                         : defaultFrequency;
+
+  if (frequency > maximumFrequency)
+    frequency = maximumFrequency;
+
+  if (frequency > maximumFrequency)
+    frequency = maximumFrequency;

[haraken, 2016/11/03 13:58:45]

Duplicated code.

[Mikhail, 2016/11/04 21:17:45]

ah, thanks!

+
+  result->frequency = frequency;
+  return result;
+}
+
 void Sensor::initSensorProxyIfNeeded() {
   if (m_sensorProxy)
     return;
 
   Document* document = toDocument(getExecutionContext());
   if (!document || !document->frame())
     return;
 
   m_sensorProxy =
       SensorProviderProxy::from(document->frame())->getOrCreateSensor(m_type);
@@ skipping 76 matching lines @@
     DCHECK(m_sensorReading);
   }
 
   m_sensorProxy->addObserver(this);
   if (!m_sensorProxy->isInitialized()) {
     m_sensorProxy->initialize();
     return;
   }
 
   if (!m_configuration) {
-    m_configuration =
-        createSensorConfig(m_sensorOptions, *m_sensorProxy->defaultConfig());
+    m_configuration = createSensorConfig();
     DCHECK(m_configuration);
+    DCHECK(m_configuration->frequency &&

[timvolodine, 2016/11/03 17:32:56]

nit: m_configuration->frequency > 0 ? (or maybe >= dunno)

[Mikhail, 2016/11/04 21:17:45]

Done.

+           m_configuration->frequency <= m_sensorProxy->maximumFrequency());
   }
 
   auto startCallback =
       WTF::bind(&Sensor::onStartRequestCompleted, wrapWeakPersistent(this));
   m_sensorProxy->addConfiguration(m_configuration->Clone(),
                                   std::move(startCallback));
 }
 
 void Sensor::stopListening() {
   DCHECK(m_sensorProxy);
@@ skipping 81 matching lines @@
 void Sensor::notifyStateChanged() {
   dispatchEvent(Event::create(EventTypeNames::statechange));
 }
 
 void Sensor::notifyError(DOMException* error) {
   dispatchEvent(
       SensorErrorEvent::create(EventTypeNames::error, std::move(error)));
 }
 
 }  // namespace blink