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

Side by Side Diff: third_party/WebKit/Source/modules/sensor/SensorProxy.cpp

Issue 2704123006: [Sensors] Clamp given sampling frequency to the minimum supported one (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/sensor/SensorProxy.h" 5 #include "modules/sensor/SensorProxy.h"
6 6
7 #include "core/dom/Document.h" 7 #include "core/dom/Document.h"
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "modules/sensor/SensorProviderProxy.h" 9 #include "modules/sensor/SensorProviderProxy.h"
10 #include "modules/sensor/SensorReadingUpdater.h" 10 #include "modules/sensor/SensorReadingUpdater.h"
11 #include "platform/mojo/MojoHelper.h" 11 #include "platform/mojo/MojoHelper.h"
12 #include "public/platform/Platform.h" 12 #include "public/platform/Platform.h"
13 13
14 using namespace device::mojom::blink; 14 using namespace device::mojom::blink;
15 15
16 namespace blink { 16 namespace blink {
17 17
18 SensorProxy::SensorProxy(SensorType sensorType, 18 SensorProxy::SensorProxy(SensorType sensorType,
19 SensorProviderProxy* provider, 19 SensorProviderProxy* provider,
20 Page* page) 20 Page* page)
21 : PageVisibilityObserver(page), 21 : PageVisibilityObserver(page),
22 m_type(sensorType), 22 m_type(sensorType),
23 m_mode(ReportingMode::CONTINUOUS), 23 m_mode(ReportingMode::CONTINUOUS),
24 m_provider(provider), 24 m_provider(provider),
25 m_clientBinding(this), 25 m_clientBinding(this),
26 m_state(SensorProxy::Uninitialized), 26 m_state(SensorProxy::Uninitialized),
27 m_suspended(false), 27 m_suspended(false) {}
28 m_maximumFrequency(0.0) {}
29 28
30 SensorProxy::~SensorProxy() {} 29 SensorProxy::~SensorProxy() {}
31 30
32 void SensorProxy::dispose() { 31 void SensorProxy::dispose() {
33 m_clientBinding.Close(); 32 m_clientBinding.Close();
34 } 33 }
35 34
36 DEFINE_TRACE(SensorProxy) { 35 DEFINE_TRACE(SensorProxy) {
37 visitor->trace(m_readingUpdater); 36 visitor->trace(m_readingUpdater);
38 visitor->trace(m_observers); 37 visitor->trace(m_observers);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 204
206 m_sharedBufferHandle = std::move(params->memory); 205 m_sharedBufferHandle = std::move(params->memory);
207 DCHECK(!m_sharedBuffer); 206 DCHECK(!m_sharedBuffer);
208 m_sharedBuffer = 207 m_sharedBuffer =
209 m_sharedBufferHandle->MapAtOffset(kReadBufferSize, params->buffer_offset); 208 m_sharedBufferHandle->MapAtOffset(kReadBufferSize, params->buffer_offset);
210 209
211 if (!m_sharedBuffer) { 210 if (!m_sharedBuffer) {
212 handleSensorError(); 211 handleSensorError();
213 return; 212 return;
214 } 213 }
214 m_frequencyLimits.first = params->minimum_frequency;
215 m_frequencyLimits.second = params->maximum_frequency;
215 216
216 m_maximumFrequency = params->maximum_frequency; 217 DCHECK_GT(m_frequencyLimits.first, 0);
217 DCHECK(m_maximumFrequency <= SensorConfiguration::kMaxAllowedFrequency); 218 DCHECK(m_frequencyLimits.first <= m_frequencyLimits.second);
Reilly Grant (use Gerrit) 2017/02/22 18:40:15 DCHECK_GE
Mikhail 2017/02/23 12:42:34 Done.
219 DCHECK(m_frequencyLimits.second <= SensorConfiguration::kMaxAllowedFrequency);
Reilly Grant (use Gerrit) 2017/02/22 18:40:15 DCHECK_GE
Mikhail 2017/02/23 12:42:34 Done.
218 220
219 auto errorCallback = 221 auto errorCallback =
220 WTF::bind(&SensorProxy::handleSensorError, wrapWeakPersistent(this), 222 WTF::bind(&SensorProxy::handleSensorError, wrapWeakPersistent(this),
221 UnknownError, String("Internal error"), String()); 223 UnknownError, String("Internal error"), String());
222 m_sensor.set_connection_error_handler( 224 m_sensor.set_connection_error_handler(
223 convertToBaseCallback(std::move(errorCallback))); 225 convertToBaseCallback(std::move(errorCallback)));
224 226
225 m_readingUpdater = SensorReadingUpdater::create(this, m_mode); 227 m_readingUpdater = SensorReadingUpdater::create(this, m_mode);
226 228
227 m_state = Initialized; 229 m_state = Initialized;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 const device::OneWriterSeqLock& seqlock = buffer->seqlock.value(); 267 const device::OneWriterSeqLock& seqlock = buffer->seqlock.value();
266 auto version = seqlock.ReadBegin(); 268 auto version = seqlock.ReadBegin();
267 auto readingData = buffer->reading; 269 auto readingData = buffer->reading;
268 if (seqlock.ReadRetry(version)) 270 if (seqlock.ReadRetry(version))
269 return false; 271 return false;
270 result = readingData; 272 result = readingData;
271 return true; 273 return true;
272 } 274 }
273 275
274 } // namespace blink 276 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698