| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2013 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 * 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 |
| 26 #include "config.h" | 27 #include "config.h" |
| 27 #include "modules/geolocation/Coordinates.h" | 28 #include "core/page/PageLifecycleNotifier.h" |
| 28 | 29 |
| 29 namespace WebCore { | 30 namespace WebCore { |
| 30 | 31 |
| 31 double Coordinates::altitude(bool& isNull) const | 32 PageLifecycleNotifier::PageLifecycleNotifier(SimpleLifecycleContext* context) |
| 33 : SimpleLifecycleNotifier(context) |
| 32 { | 34 { |
| 33 if (m_canProvideAltitude) | |
| 34 return m_altitude; | |
| 35 | |
| 36 isNull = true; | |
| 37 return 0; | |
| 38 } | 35 } |
| 39 | 36 |
| 40 double Coordinates::altitudeAccuracy(bool& isNull) const | 37 void PageLifecycleNotifier::addObserver(SimpleLifecycleObserver* observer, Simpl
eLifecycleObserver::Type type) |
| 41 { | 38 { |
| 42 if (m_canProvideAltitudeAccuracy) | 39 if (type == SimpleLifecycleObserver::PageLifecycleObserverType) { |
| 43 return m_altitudeAccuracy; | 40 RELEASE_ASSERT(m_iterating != IteratingOverPageObservers); |
| 41 m_pageObservers.add(static_cast<PageLifecycleObserver*>(observer)); |
| 42 } |
| 44 | 43 |
| 45 isNull = true; | 44 SimpleLifecycleNotifier::addObserver(observer, type); |
| 46 return 0; | |
| 47 } | 45 } |
| 48 | 46 |
| 49 double Coordinates::heading(bool& isNull) const | 47 void PageLifecycleNotifier::removeObserver(SimpleLifecycleObserver* observer, Si
mpleLifecycleObserver::Type type) |
| 50 { | 48 { |
| 51 if (m_canProvideHeading) | 49 if (type == SimpleLifecycleObserver::PageLifecycleObserverType) { |
| 52 return m_heading; | 50 RELEASE_ASSERT(m_iterating != IteratingOverPageObservers); |
| 51 m_pageObservers.remove(static_cast<PageLifecycleObserver*>(observer)); |
| 52 } |
| 53 | 53 |
| 54 isNull = true; | 54 SimpleLifecycleNotifier::removeObserver(observer, type); |
| 55 return 0; | |
| 56 } | 55 } |
| 57 | 56 |
| 58 double Coordinates::speed(bool& isNull) const | |
| 59 { | |
| 60 if (m_canProvideSpeed) | |
| 61 return m_speed; | |
| 62 | |
| 63 isNull = true; | |
| 64 return 0; | |
| 65 } | |
| 66 | |
| 67 } // namespace WebCore | 57 } // namespace WebCore |
| OLD | NEW |