| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Apple Inc. All Rights Reserved. | 3 * Copyright (C) 2012 Apple Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 void asyncUpdateController(); | 69 void asyncUpdateController(); |
| 70 void controllerTimerFired(Timer<GeolocationClientMock>*); | 70 void controllerTimerFired(Timer<GeolocationClientMock>*); |
| 71 | 71 |
| 72 void asyncUpdatePermission(); | 72 void asyncUpdatePermission(); |
| 73 void permissionTimerFired(Timer<GeolocationClientMock>*); | 73 void permissionTimerFired(Timer<GeolocationClientMock>*); |
| 74 | 74 |
| 75 void clearError(); | 75 void clearError(); |
| 76 | 76 |
| 77 HashSet<GeolocationController*> m_controllers; | 77 typedef WillBeHeapHashSet<RawPtrWillBeMember<GeolocationController> > Geoloc
ationControllers; |
| 78 WillBePersistentHeapHashSet<RawPtrWillBeMember<GeolocationController> > m_co
ntrollers; |
| 78 Persistent<GeolocationPosition> m_lastPosition; | 79 Persistent<GeolocationPosition> m_lastPosition; |
| 79 bool m_hasError; | 80 bool m_hasError; |
| 80 String m_errorMessage; | 81 String m_errorMessage; |
| 81 Timer<GeolocationClientMock> m_controllerTimer; | 82 Timer<GeolocationClientMock> m_controllerTimer; |
| 82 Timer<GeolocationClientMock> m_permissionTimer; | 83 Timer<GeolocationClientMock> m_permissionTimer; |
| 83 bool m_isActive; | 84 bool m_isActive; |
| 84 | 85 |
| 85 enum PermissionState { | 86 enum PermissionState { |
| 86 PermissionStateUnset, | 87 PermissionStateUnset, |
| 87 PermissionStateAllowed, | 88 PermissionStateAllowed, |
| 88 PermissionStateDenied | 89 PermissionStateDenied |
| 89 }; | 90 }; |
| 90 | 91 |
| 91 PermissionState m_permissionState; | 92 PermissionState m_permissionState; |
| 92 typedef PersistentHeapHashSet<Member<Geolocation> > GeolocationSet; | 93 typedef HeapHashSet<Member<Geolocation> > GeolocationSet; |
| 93 GeolocationSet m_pendingPermissions; | 94 PersistentHeapHashSet<Member<Geolocation> > m_pendingPermissions; |
| 94 }; | 95 }; |
| 95 | 96 |
| 96 } | 97 } |
| 97 | 98 |
| 98 #endif | 99 #endif |
| OLD | NEW |