Fixes WebKit Geolocation bug 27255.

We should not call the error callback if the success callback raises an exception.
This is currently being submitted to WebKit as bug 27255.

1 files changed, 2 insertions, 12 deletions

diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 8abe8a6..8df6990 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -182,12 +182,7 @@ void Geolocation::sendPositionToOneShots(Geoposition* position)
         ASSERT(notifier->m_successCallback);
         
         notifier->m_timer.stop();
-        bool shouldCallErrorCallback = false;
-        notifier->m_successCallback->handleEvent(position, shouldCallErrorCallback);
-        if (shouldCallErrorCallback) {
-            RefPtr<PositionError> error = PositionError::create(PositionError::UNKNOWN_ERROR, "An exception was thrown");
-            handleError(error.get());
-        }
+        notifier->m_successCallback->handleEvent(position);
     }
 }
 
@@ -202,12 +197,7 @@ void Geolocation::sendPositionToWatchers(Geoposition* position)
         ASSERT(notifier->m_successCallback);
         
         notifier->m_timer.stop();
-        bool shouldCallErrorCallback = false;
-        notifier->m_successCallback->handleEvent(position, shouldCallErrorCallback);
-        if (shouldCallErrorCallback) {
-            RefPtr<PositionError> error = PositionError::create(PositionError::UNKNOWN_ERROR, "An exception was thrown");
-            handleError(error.get());
-        }
+        notifier->m_successCallback->handleEvent(position);
     }
 }