#include "modules/geolocation/GeolocationPosition.h"
#include "wtf/CurrentTime.h"
-namespace WebCore {
+namespace blink {
static const char permissionDeniedErrorMessage[] = "User denied Geolocation";
static const char failedToStartServiceErrorMessage[] = "Failed to start Geolocation service";
return PositionError::create(code, error->message());
}
-Geolocation::GeoNotifier::GeoNotifier(Geolocation* geolocation, PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, PositionOptions* options)
- : m_geolocation(geolocation)
- , m_successCallback(successCallback)
- , m_errorCallback(errorCallback)
- , m_options(options)
- , m_timer(this, &Geolocation::GeoNotifier::timerFired)
- , m_useCachedPosition(false)
-{
- ASSERT(m_geolocation);
- ASSERT(m_successCallback);
- // If no options were supplied from JS, we should have created a default set
- // of options in JSGeolocationCustom.cpp.
- ASSERT(m_options);
-}
-
-void Geolocation::GeoNotifier::trace(Visitor* visitor)
-{
- visitor->trace(m_geolocation);
- visitor->trace(m_options);
- visitor->trace(m_fatalError);
-}
-
-void Geolocation::GeoNotifier::setFatalError(PositionError* error)
-{
- // If a fatal error has already been set, stick with it. This makes sure that
- // when permission is denied, this is the error reported, as required by the
- // spec.
- if (m_fatalError)
- return;
-
- m_fatalError = error;
- // An existing timer may not have a zero timeout.
- m_timer.stop();
- m_timer.startOneShot(0, FROM_HERE);
-}
-
-void Geolocation::GeoNotifier::setUseCachedPosition()
-{
- m_useCachedPosition = true;
- m_timer.startOneShot(0, FROM_HERE);
-}
-
-void Geolocation::GeoNotifier::runSuccessCallback(Geoposition* position)
-{
- // If we are here and the Geolocation permission is not approved, something has
- // gone horribly wrong.
- if (!m_geolocation->isAllowed())
- CRASH();
-
- m_successCallback->handleEvent(position);
-}
-
-void Geolocation::GeoNotifier::runErrorCallback(PositionError* error)
-{
- if (m_errorCallback)
- m_errorCallback->handleEvent(error);
-}
-
-void Geolocation::GeoNotifier::startTimer()
-{
- m_timer.startOneShot(m_options->timeout() / 1000.0, FROM_HERE);
-}
-
-void Geolocation::GeoNotifier::stopTimer()
-{
- m_timer.stop();
-}
-
-void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
-{
- m_timer.stop();
-
- // Test for fatal error first. This is required for the case where the LocalFrame is
- // disconnected and requests are cancelled.
- if (m_fatalError) {
- runErrorCallback(m_fatalError.get());
- // This will cause this notifier to be deleted.
- m_geolocation->fatalErrorOccurred(this);
- return;
- }
-
- if (m_useCachedPosition) {
- // Clear the cached position flag in case this is a watch request, which
- // will continue to run.
- m_useCachedPosition = false;
- m_geolocation->requestUsesCachedPosition(this);
- return;
- }
-
- if (m_errorCallback)
- m_errorCallback->handleEvent(PositionError::create(PositionError::TIMEOUT, "Timeout expired"));
- m_geolocation->requestTimedOut(this);
-}
-
-void Geolocation::Watchers::trace(Visitor* visitor)
-{
- visitor->trace(m_idToNotifierMap);
- visitor->trace(m_notifierToIdMap);
-}
-
-bool Geolocation::Watchers::add(int id, GeoNotifier* notifier)
-{
- ASSERT(id > 0);
- if (!m_idToNotifierMap.add(id, notifier).isNewEntry)
- return false;
- m_notifierToIdMap.set(notifier, id);
- return true;
-}
-
-Geolocation::GeoNotifier* Geolocation::Watchers::find(int id)
-{
- ASSERT(id > 0);
- IdToNotifierMap::iterator iter = m_idToNotifierMap.find(id);
- if (iter == m_idToNotifierMap.end())
- return 0;
- return iter->value.get();
-}
-
-void Geolocation::Watchers::remove(int id)
-{
- ASSERT(id > 0);
- IdToNotifierMap::iterator iter = m_idToNotifierMap.find(id);
- if (iter == m_idToNotifierMap.end())
- return;
- m_notifierToIdMap.remove(iter->value);
- m_idToNotifierMap.remove(iter);
-}
-
-void Geolocation::Watchers::remove(GeoNotifier* notifier)
-{
- NotifierToIdMap::iterator iter = m_notifierToIdMap.find(notifier);
- if (iter == m_notifierToIdMap.end())
- return;
- m_idToNotifierMap.remove(iter->value);
- m_notifierToIdMap.remove(iter);
-}
-
-bool Geolocation::Watchers::contains(GeoNotifier* notifier) const
-{
- return m_notifierToIdMap.contains(notifier);
-}
-
-void Geolocation::Watchers::clear()
-{
- m_idToNotifierMap.clear();
- m_notifierToIdMap.clear();
-}
-
-bool Geolocation::Watchers::isEmpty() const
-{
- return m_idToNotifierMap.isEmpty();
-}
-
-void Geolocation::Watchers::getNotifiersVector(GeoNotifierVector& copy) const
-{
- copyValuesToVector(m_idToNotifierMap, copy);
-}
-
Geolocation* Geolocation::create(ExecutionContext* context)
{
Geolocation* geolocation = new Geolocation(context);
Geolocation::Geolocation(ExecutionContext* context)
: ActiveDOMObject(context)
- , m_allowGeolocation(Unknown)
+ , m_geolocationPermission(PermissionUnknown)
{
ScriptWrappable::init(this);
}
Geolocation::~Geolocation()
{
- ASSERT(m_allowGeolocation != InProgress);
+ ASSERT(m_geolocationPermission != PermissionRequested);
}
void Geolocation::trace(Visitor* visitor)
void Geolocation::stop()
{
LocalFrame* frame = this->frame();
- if (frame && m_allowGeolocation == InProgress)
+ if (frame && m_geolocationPermission == PermissionRequested)
GeolocationController::from(frame)->cancelPermissionRequest(this);
+
// The frame may be moving to a new page and we want to get the permissions from the new page's client.
- m_allowGeolocation = Unknown;
+ m_geolocationPermission = PermissionUnknown;
cancelAllRequests();
stopUpdating();
m_pendingForPermissionNotifiers.clear();
return m_lastPosition.get();
}
-void Geolocation::getCurrentPosition(PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, PositionOptions* options)
+void Geolocation::getCurrentPosition(PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, const Dictionary& options)
{
if (!frame())
return;
- GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
+ GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, PositionOptions::create(options));
startRequest(notifier);
m_oneShots.add(notifier);
}
-int Geolocation::watchPosition(PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, PositionOptions* options)
+int Geolocation::watchPosition(PassOwnPtr<PositionCallback> successCallback, PassOwnPtr<PositionErrorCallback> errorCallback, const Dictionary& options)
{
if (!frame())
return 0;
- GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, options);
+ GeoNotifier* notifier = GeoNotifier::create(this, successCallback, errorCallback, PositionOptions::create(options));
startRequest(notifier);
int watchID;
notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
}
-void Geolocation::fatalErrorOccurred(Geolocation::GeoNotifier* notifier)
+void Geolocation::fatalErrorOccurred(GeoNotifier* notifier)
{
// This request has failed fatally. Remove it from our lists.
m_oneShots.remove(notifier);
void Geolocation::setIsAllowed(bool allowed)
{
- // This may be due to either a new position from the service, or a cached
- // position.
- m_allowGeolocation = allowed ? Yes : No;
+ // This may be due to either a new position from the service, or a cached position.
+ m_geolocationPermission = allowed ? PermissionAllowed : PermissionDenied;
// Permission request was made during the startRequest process
if (!m_pendingForPermissionNotifiers.isEmpty()) {
void Geolocation::requestPermission()
{
- if (m_allowGeolocation > Unknown)
+ if (m_geolocationPermission != PermissionUnknown)
return;
LocalFrame* frame = this->frame();
if (!frame)
return;
- m_allowGeolocation = InProgress;
+ m_geolocationPermission = PermissionRequested;
// Ask the embedder: it maintains the geolocation challenge policy itself.
GeolocationController::from(frame)->requestPermission(this);
}
}
-} // namespace WebCore
+} // namespace blink
projects / platform / framework / web / crosswalk.git / blobdiff