OLD | NEW |
---|---|
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/geofencing/CircularRegion.h" | 6 #include "modules/geofencing/CircularRegion.h" |
7 | 7 |
8 #include "bindings/core/v8/Dictionary.h" | 8 #include "bindings/core/v8/Dictionary.h" |
9 #include "public/platform/WebCircularRegion.h" | |
10 #include "public/platform/WebString.h" | |
9 | 11 |
10 namespace blink { | 12 namespace blink { |
11 | 13 |
12 CircularRegionInit::CircularRegionInit(const Dictionary& init) | 14 CircularRegionInit::CircularRegionInit(const Dictionary& init) |
13 : latitude(0) | 15 : latitude(0) |
14 , longitude(0) | 16 , longitude(0) |
15 , radius(0) | 17 , radius(0) |
16 { | 18 { |
17 DictionaryHelper::get(init, "id", id); | 19 DictionaryHelper::get(init, "id", id); |
18 DictionaryHelper::get(init, "latitude", latitude); | 20 DictionaryHelper::get(init, "latitude", latitude); |
19 DictionaryHelper::get(init, "longitude", longitude); | 21 DictionaryHelper::get(init, "longitude", longitude); |
20 DictionaryHelper::get(init, "radius", radius); | 22 DictionaryHelper::get(init, "radius", radius); |
21 } | 23 } |
22 | 24 |
23 CircularRegion* CircularRegion::create(const Dictionary& init) | 25 CircularRegion* CircularRegion::create(const Dictionary& init) |
24 { | 26 { |
25 return new CircularRegion(CircularRegionInit(init)); | 27 CircularRegionInit rinit(init); |
abarth-chromium
2014/08/23 05:43:34
rinit -> please use complete words in variable nam
Marijn Kruisselbrink
2014/08/25 22:25:25
Done.
| |
28 return new CircularRegion(WebCircularRegion::create(rinit.id, rinit.latitude , rinit.longitude, rinit.radius)); | |
abarth-chromium
2014/08/23 05:43:34
So much mallocing. Can't WebCircularRegion just b
| |
26 } | 29 } |
27 | 30 |
28 CircularRegion::CircularRegion(const CircularRegionInit& init) | 31 CircularRegion::CircularRegion(const WebCircularRegion& region) |
29 : GeofencingRegion(init.id) | 32 : GeofencingRegion(region) |
30 , m_latitude(init.latitude) | |
31 , m_longitude(init.longitude) | |
32 , m_radius(init.radius) | |
33 { | 33 { |
34 ScriptWrappable::init(this); | 34 ScriptWrappable::init(this); |
35 } | 35 } |
36 | 36 |
37 double CircularRegion::latitude() const | |
38 { | |
39 return webRegion().toConst<WebCircularRegion>().latitude(); | |
abarth-chromium
2014/08/23 05:43:34
So ugly...
Why not just have WebCircularRegion be
| |
40 } | |
41 | |
42 double CircularRegion::longitude() const | |
43 { | |
44 return webRegion().toConst<WebCircularRegion>().longitude(); | |
45 } | |
46 | |
47 double CircularRegion::radius() const | |
48 { | |
49 return webRegion().toConst<WebCircularRegion>().radius(); | |
50 } | |
51 | |
37 } // namespace blink | 52 } // namespace blink |
OLD | NEW |