[Sensors] Clamp given sampling frequency to the minimum supported one

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/TaskRunnerHelper.h"
 #include "core/inspector/ConsoleMessage.h"
@@ skipping 27 matching lines @@
   if (!toDocument(executionContext)->domWindow()->frame() ||
       !toDocument(executionContext)->frame()->isMainFrame()) {
     exceptionState.throwSecurityError(
         "Must be in a top-level browsing context");
     return;
   }
 
   // Check the given frequency value.
   if (m_sensorOptions.hasFrequency()) {
     double frequency = m_sensorOptions.frequency();
-    if (frequency <= 0.0) {
-      exceptionState.throwRangeError("Frequency must be positive.");
-      return;
-    }
-
     if (frequency > SensorConfiguration::kMaxAllowedFrequency) {
       m_sensorOptions.setFrequency(SensorConfiguration::kMaxAllowedFrequency);
       ConsoleMessage* consoleMessage = ConsoleMessage::create(
           JSMessageSource, InfoMessageLevel, "Frequency is limited to 60 Hz.");
       executionContext->addConsoleMessage(consoleMessage);
     }
   }
 }
 
 Sensor::~Sensor() = default;
@@ skipping 81 matching lines @@
       m_state == Sensor::SensorState::Idle ||
       m_state == Sensor::SensorState::Errored)
     return false;
   return getExecutionContext() && hasEventListeners();
 }
 
 auto Sensor::createSensorConfig() -> SensorConfigurationPtr {
   auto result = SensorConfiguration::New();
 
   double defaultFrequency = m_sensorProxy->defaultConfig()->frequency;
-  double maximumFrequency = m_sensorProxy->maximumFrequency();
+  double minimumFrequency = m_sensorProxy->frequencyLimits().first;
+  double maximumFrequency = m_sensorProxy->frequencyLimits().second;
 
   double frequency = m_sensorOptions.hasFrequency()
                          ? m_sensorOptions.frequency()
                          : defaultFrequency;
 
   if (frequency > maximumFrequency)
     frequency = maximumFrequency;
+  if (frequency < minimumFrequency)
+    frequency = minimumFrequency;
 
   result->frequency = frequency;
   return result;
 }
 
 double Sensor::readingValue(int index, bool& isNull) const {
   if (!canReturnReadings()) {
     isNull = true;
     return 0.0;
   }
@@ skipping 69 matching lines @@
   m_sensorProxy->addObserver(this);
   if (!m_sensorProxy->isInitialized()) {
     m_sensorProxy->initialize();
     return;
   }
 
   if (!m_configuration) {
     m_configuration = createSensorConfig();
     DCHECK(m_configuration);
     DCHECK(m_configuration->frequency > 0 &&
-           m_configuration->frequency <= m_sensorProxy->maximumFrequency());
+           m_configuration->frequency <=
+               SensorConfiguration::kMaxAllowedFrequency);
   }
 
   auto startCallback =
       WTF::bind(&Sensor::onStartRequestCompleted, wrapWeakPersistent(this));
   m_sensorProxy->addConfiguration(m_configuration->Clone(),
                                   std::move(startCallback));
 }
 
 void Sensor::stopListening() {
   DCHECK(m_sensorProxy);
@@ skipping 57 matching lines @@
 }
 
 bool Sensor::canReturnReadings() const {
   if (m_state != Sensor::SensorState::Activated)
     return false;
   DCHECK(m_sensorProxy);
   return m_sensorProxy->reading().timestamp != 0.0;
 }
 
 }  // namespace blink