Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: third_party/WebKit/Source/modules/sensor/Sensor.cpp

Issue 2704123006: [Sensors] Clamp given sampling frequency to the minimum supported one (Closed)
Patch Set: rebased Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/sensor/Sensor.cpp
diff --git a/third_party/WebKit/Source/modules/sensor/Sensor.cpp b/third_party/WebKit/Source/modules/sensor/Sensor.cpp
index e930490d6e17f30de0a88fb59bfecb10a52d4d89..c864dda453a3745afea78a6724a0b6802ee1b347 100644
--- a/third_party/WebKit/Source/modules/sensor/Sensor.cpp
+++ b/third_party/WebKit/Source/modules/sensor/Sensor.cpp
@@ -45,11 +45,6 @@ Sensor::Sensor(ExecutionContext* executionContext,
// 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(
@@ -151,7 +146,8 @@ 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()
@@ -159,6 +155,8 @@ auto Sensor::createSensorConfig() -> SensorConfigurationPtr {
if (frequency > maximumFrequency)
frequency = maximumFrequency;
+ if (frequency < minimumFrequency)
+ frequency = minimumFrequency;
result->frequency = frequency;
return result;
@@ -248,7 +246,8 @@ void Sensor::startListening() {
m_configuration = createSensorConfig();
DCHECK(m_configuration);
DCHECK(m_configuration->frequency > 0 &&
- m_configuration->frequency <= m_sensorProxy->maximumFrequency());
+ m_configuration->frequency <=
+ SensorConfiguration::kMaxAllowedFrequency);
}
auto startCallback =

Powered by Google App Engine
This is Rietveld 408576698