OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
13 * | 13 * |
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "public/web/WebGeolocationPermissionRequestManager.h" | 27 #include "public/web/WebGeolocationPermissionRequestManager.h" |
28 | 28 |
29 #include "modules/geolocation/Geolocation.h" | |
29 #include "public/web/WebGeolocationPermissionRequest.h" | 30 #include "public/web/WebGeolocationPermissionRequest.h" |
30 #include "wtf/HashMap.h" | 31 #include "wtf/HashMap.h" |
31 | 32 |
32 namespace blink { | 33 namespace blink { |
33 | 34 |
34 using namespace WebCore; | 35 using namespace WebCore; |
35 | 36 |
36 typedef HashMap<Geolocation*, int> GeolocationIdMap; | 37 typedef PersistentHeapHashMap<Member<Geolocation>, int> GeolocationIdMap; |
37 typedef HashMap<int, Geolocation*> IdGeolocationMap; | 38 typedef PersistentHeapHashMap<int, Member<Geolocation> > IdGeolocationMap; |
haraken
2014/06/06 01:31:54
Won't these Members cause a cycle?
Even if you ex
tkent
2014/06/06 02:29:06
I don't think this causes any cycles. I don't unde
haraken
2014/06/06 02:34:34
oh, sorry, I was misreading the code. Ignore my co
| |
38 | 39 |
39 class WebGeolocationPermissionRequestManagerPrivate { | 40 class WebGeolocationPermissionRequestManagerPrivate { |
40 public: | 41 public: |
41 GeolocationIdMap m_geolocationIdMap; | 42 GeolocationIdMap m_geolocationIdMap; |
42 IdGeolocationMap m_idGeolocationMap; | 43 IdGeolocationMap m_idGeolocationMap; |
43 }; | 44 }; |
44 | 45 |
45 int WebGeolocationPermissionRequestManager::add(const blink::WebGeolocationPermi ssionRequest& permissionRequest) | 46 int WebGeolocationPermissionRequestManager::add(const blink::WebGeolocationPermi ssionRequest& permissionRequest) |
46 { | 47 { |
47 Geolocation* geolocation = permissionRequest.geolocation(); | 48 Geolocation* geolocation = permissionRequest.geolocation(); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
81 { | 82 { |
82 m_private.reset(new WebGeolocationPermissionRequestManagerPrivate); | 83 m_private.reset(new WebGeolocationPermissionRequestManagerPrivate); |
83 } | 84 } |
84 | 85 |
85 void WebGeolocationPermissionRequestManager::reset() | 86 void WebGeolocationPermissionRequestManager::reset() |
86 { | 87 { |
87 m_private.reset(0); | 88 m_private.reset(0); |
88 } | 89 } |
89 | 90 |
90 } // namespace blink | 91 } // namespace blink |
OLD | NEW |