Index: Source/modules/geolocation/Geolocation.cpp |
diff --git a/Source/modules/geolocation/Geolocation.cpp b/Source/modules/geolocation/Geolocation.cpp |
index 17a7b2745ab502cff43aa96d32f6adbd52c15c5a..66da490c700c83b992ab2c391dd5ff1fdc07a285 100644 |
--- a/Source/modules/geolocation/Geolocation.cpp |
+++ b/Source/modules/geolocation/Geolocation.cpp |
@@ -165,7 +165,7 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*) |
} |
if (m_errorCallback) { |
- RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, ASCIILiteral("Timeout expired")); |
+ RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timeout expired"); |
m_errorCallback->handleEvent(error.get()); |
} |
m_geolocation->requestTimedOut(this); |
@@ -320,7 +320,7 @@ void Geolocation::startRequest(GeoNotifier *notifier) |
// Check whether permissions have already been denied. Note that if this is the case, |
// the permission state can not change again in the lifetime of this page. |
if (isDenied()) |
- notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage))); |
+ notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage)); |
else if (haveSuitableCachedPosition(notifier->options())) |
notifier->setUseCachedPosition(); |
else if (notifier->hasZeroTimeout()) |
@@ -332,7 +332,7 @@ void Geolocation::startRequest(GeoNotifier *notifier) |
} else if (startUpdating(notifier)) |
notifier->startTimerIfNeeded(); |
else |
- notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(failedToStartServiceErrorMessage))); |
+ notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage)); |
} |
void Geolocation::fatalErrorOccurred(Geolocation::GeoNotifier* notifier) |
@@ -350,7 +350,7 @@ void Geolocation::requestUsesCachedPosition(GeoNotifier* notifier) |
// This is called asynchronously, so the permissions could have been denied |
// since we last checked in startRequest. |
if (isDenied()) { |
- notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage))); |
+ notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage)); |
return; |
} |
@@ -384,7 +384,7 @@ void Geolocation::makeCachedPositionCallbacks() |
if (notifier->hasZeroTimeout() || startUpdating(notifier)) |
notifier->startTimerIfNeeded(); |
else |
- notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(failedToStartServiceErrorMessage))); |
+ notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage)); |
} |
} |
@@ -446,7 +446,7 @@ void Geolocation::setIsAllowed(bool allowed) |
} |
if (!isAllowed()) { |
- RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage)); |
+ RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage); |
error->setIsFatal(true); |
handleError(error.get()); |
m_requestsAwaitingCachedPosition.clear(); |
@@ -512,7 +512,7 @@ void Geolocation::cancelRequests(GeoNotifierVector& notifiers) |
{ |
GeoNotifierVector::const_iterator end = notifiers.end(); |
for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it) |
- (*it)->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(framelessDocumentErrorMessage))); |
+ (*it)->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, framelessDocumentErrorMessage)); |
} |
void Geolocation::cancelAllRequests() |
@@ -671,9 +671,10 @@ void Geolocation::handlePendingPermissionNotifiers() |
if (startUpdating(notifier)) |
notifier->startTimerIfNeeded(); |
else |
- notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(failedToStartServiceErrorMessage))); |
- } else |
- notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage))); |
+ notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage)); |
+ } else { |
+ notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage)); |
+ } |
} |
} |