| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 m_client->cancelPermissionRequest(geolocation); | 126 m_client->cancelPermissionRequest(geolocation); |
| 127 } | 127 } |
| 128 | 128 |
| 129 void GeolocationController::positionChanged(GeolocationPosition* position) | 129 void GeolocationController::positionChanged(GeolocationPosition* position) |
| 130 { | 130 { |
| 131 if (!position) { | 131 if (!position) { |
| 132 errorOccurred(GeolocationError::create(GeolocationError::PositionUnavail
able, "PositionUnavailable")); | 132 errorOccurred(GeolocationError::create(GeolocationError::PositionUnavail
able, "PositionUnavailable")); |
| 133 return; | 133 return; |
| 134 } | 134 } |
| 135 m_lastPosition = position; | 135 m_lastPosition = position; |
| 136 HeapVector<Member<Geolocation> > observersVector; | 136 HeapVector<Member<Geolocation>> observersVector; |
| 137 copyToVector(m_observers, observersVector); | 137 copyToVector(m_observers, observersVector); |
| 138 for (size_t i = 0; i < observersVector.size(); ++i) | 138 for (size_t i = 0; i < observersVector.size(); ++i) |
| 139 observersVector[i]->positionChanged(); | 139 observersVector[i]->positionChanged(); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void GeolocationController::errorOccurred(GeolocationError* error) | 142 void GeolocationController::errorOccurred(GeolocationError* error) |
| 143 { | 143 { |
| 144 HeapVector<Member<Geolocation> > observersVector; | 144 HeapVector<Member<Geolocation>> observersVector; |
| 145 copyToVector(m_observers, observersVector); | 145 copyToVector(m_observers, observersVector); |
| 146 for (size_t i = 0; i < observersVector.size(); ++i) | 146 for (size_t i = 0; i < observersVector.size(); ++i) |
| 147 observersVector[i]->setError(error); | 147 observersVector[i]->setError(error); |
| 148 } | 148 } |
| 149 | 149 |
| 150 GeolocationPosition* GeolocationController::lastPosition() | 150 GeolocationPosition* GeolocationController::lastPosition() |
| 151 { | 151 { |
| 152 if (m_lastPosition.get()) | 152 if (m_lastPosition.get()) |
| 153 return m_lastPosition.get(); | 153 return m_lastPosition.get(); |
| 154 | 154 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 WillBeHeapSupplement<LocalFrame>::trace(visitor); | 193 WillBeHeapSupplement<LocalFrame>::trace(visitor); |
| 194 PageLifecycleObserver::trace(visitor); | 194 PageLifecycleObserver::trace(visitor); |
| 195 } | 195 } |
| 196 | 196 |
| 197 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client) | 197 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client) |
| 198 { | 198 { |
| 199 WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::su
pplementName(), GeolocationController::create(frame, client)); | 199 WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::su
pplementName(), GeolocationController::create(frame, client)); |
| 200 } | 200 } |
| 201 | 201 |
| 202 } // namespace blink | 202 } // namespace blink |
| OLD | NEW |