Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 | 65 |
| 66 // Inherited from PageLifecycleObserver. | 66 // Inherited from PageLifecycleObserver. |
| 67 virtual void pageVisibilityChanged() OVERRIDE; | 67 virtual void pageVisibilityChanged() OVERRIDE; |
| 68 | 68 |
| 69 static const char* supplementName(); | 69 static const char* supplementName(); |
| 70 static GeolocationController* from(LocalFrame* frame) { return static_cast<G eolocationController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementN ame())); } | 70 static GeolocationController* from(LocalFrame* frame) { return static_cast<G eolocationController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementN ame())); } |
| 71 | 71 |
| 72 virtual void trace(Visitor*) OVERRIDE; | 72 virtual void trace(Visitor*) OVERRIDE; |
| 73 | 73 |
| 74 virtual void willBeDestroyed() OVERRIDE; | 74 virtual void willBeDestroyed() OVERRIDE; |
| 75 virtual void persistentHostHasBeenDestroyed() OVERRIDE; | |
|
Michael van Ouwerkerk
2014/06/12 12:32:34
Nit: please note where these are inherited from.
zerny-chromium
2014/06/12 13:39:25
Done.
| |
| 75 | 76 |
| 76 private: | 77 private: |
| 77 GeolocationController(LocalFrame&, GeolocationClient*); | 78 GeolocationController(LocalFrame&, GeolocationClient*); |
| 78 | 79 |
| 79 void startUpdatingIfNeeded(); | 80 void startUpdatingIfNeeded(); |
| 80 void stopUpdatingIfNeeded(); | 81 void stopUpdatingIfNeeded(); |
| 81 | 82 |
| 82 GeolocationClient* m_client; | 83 GeolocationClient* m_client; |
| 83 bool m_hasClientForTest; | 84 bool m_hasClientForTest; |
| 84 | 85 |
| 85 PersistentWillBeMember<GeolocationPosition> m_lastPosition; | 86 PersistentWillBeMember<GeolocationPosition> m_lastPosition; |
| 86 typedef PersistentHeapHashSetWillBeHeapHashSet<Member<Geolocation> > Observe rsSet; | 87 typedef PersistentHeapHashSetWillBeHeapHashSet<Member<Geolocation> > Observe rsSet; |
| 87 // All observers; both those requesting high accuracy and those not. | 88 // All observers; both those requesting high accuracy and those not. |
| 88 ObserversSet m_observers; | 89 ObserversSet m_observers; |
| 89 ObserversSet m_highAccuracyObservers; | 90 ObserversSet m_highAccuracyObservers; |
| 90 bool m_isClientUpdating; | 91 bool m_isClientUpdating; |
| 91 GeolocationInspectorAgent* m_inspectorAgent; | 92 GeolocationInspectorAgent* m_inspectorAgent; |
| 92 }; | 93 }; |
| 93 | 94 |
| 94 } // namespace WebCore | 95 } // namespace WebCore |
| 95 | 96 |
| 96 #endif // GeolocationController_h | 97 #endif // GeolocationController_h |
| OLD | NEW |