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

Side by Side Diff: Source/modules/geolocation/PositionOptions.cpp

Issue 382443002: maximumAge and timeout should be used after initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "modules/geolocation/PositionOptions.h" 6 #include "modules/geolocation/PositionOptions.h"
7 7
8 #include "bindings/core/v8/Dictionary.h" 8 #include "bindings/core/v8/Dictionary.h"
9 #include <limits.h> 9 #include <limits.h>
10 10
11 namespace WebCore { 11 namespace WebCore {
12 12
13 PositionOptions* PositionOptions::create(const Dictionary& options) 13 PositionOptions* PositionOptions::create(const Dictionary& options)
14 { 14 {
15 return new PositionOptions(options); 15 return new PositionOptions(options);
16 } 16 }
17 17
18 PositionOptions::PositionOptions(const Dictionary& options) 18 PositionOptions::PositionOptions(const Dictionary& options)
19 : m_highAccuracy(false) 19 : m_highAccuracy(false)
20 , m_maximumAge(0) 20 , m_maximumAge(0)
21 , m_timeout(std::numeric_limits<unsigned>::max()) 21 , m_timeout(std::numeric_limits<unsigned>::max())
22 { 22 {
23 if (options.hasProperty("enableHighAccuracy")) 23 if (options.hasProperty("enableHighAccuracy")) {
24 options.get("enableHighAccuracy", m_highAccuracy); 24 bool highAccuracy;
25 if (options.get("enableHighAccuracy", highAccuracy))
26 m_highAccuracy = highAccuracy;
27 }
25 if (options.hasProperty("maximumAge")) { 28 if (options.hasProperty("maximumAge")) {
26 double maximumAge; 29 double maximumAge;
27 options.get("maximumAge", maximumAge); 30 if (options.get("maximumAge", maximumAge)) {
28 if (maximumAge < 0) 31 if (maximumAge < 0)
29 m_maximumAge = 0; 32 m_maximumAge = 0;
30 else if (maximumAge > std::numeric_limits<unsigned>::max()) 33 else if (maximumAge > std::numeric_limits<unsigned>::max())
31 m_maximumAge = std::numeric_limits<unsigned>::max(); 34 m_maximumAge = std::numeric_limits<unsigned>::max();
32 else 35 else
33 m_maximumAge = maximumAge; 36 m_maximumAge = maximumAge;
37 }
34 } 38 }
35 if (options.hasProperty("timeout")) { 39 if (options.hasProperty("timeout")) {
36 double timeout; 40 double timeout;
37 options.get("timeout", timeout); 41 if (options.get("timeout", timeout)) {
38 if (timeout < 0) 42 if (timeout < 0)
39 m_timeout = 0; 43 m_timeout = 0;
40 else if (timeout > std::numeric_limits<unsigned>::max()) 44 else if (timeout > std::numeric_limits<unsigned>::max())
41 m_timeout = std::numeric_limits<unsigned>::max(); 45 m_timeout = std::numeric_limits<unsigned>::max();
42 else 46 else
43 m_timeout = timeout; 47 m_timeout = timeout;
48 }
44 } 49 }
45 } 50 }
46 51
47 } // namespace WebCore 52 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698