From 75505f2fc5827c662d9bb0a0a8b90219c23e7e85 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 24 Jul 2009 13:59:28 +0100
Subject: 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.
---
 WebCore/bindings/js/JSCustomPositionCallback.cpp | 3 +--
 WebCore/bindings/js/JSCustomPositionCallback.h   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'WebCore/bindings/js')

diff --git a/WebCore/bindings/js/JSCustomPositionCallback.cpp b/WebCore/bindings/js/JSCustomPositionCallback.cpp
index 6f9efd9..6d892f0 100644
--- a/WebCore/bindings/js/JSCustomPositionCallback.cpp
+++ b/WebCore/bindings/js/JSCustomPositionCallback.cpp
@@ -41,7 +41,7 @@ JSCustomPositionCallback::JSCustomPositionCallback(JSObject* callback, Frame* fr
 {
 }
 
-void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool& raisedException)
+void JSCustomPositionCallback::handleEvent(Geoposition* geoposition)
 {
     ASSERT(m_callback);
     ASSERT(m_frame);
@@ -77,7 +77,6 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition, bool& raise
     
     if (exec->hadException()) {
         reportCurrentException(exec);
-        raisedException = true;
     }
     
     Document::updateStyleForAllDocuments();
diff --git a/WebCore/bindings/js/JSCustomPositionCallback.h b/WebCore/bindings/js/JSCustomPositionCallback.h
index 6c0d306..9c8fe86 100644
--- a/WebCore/bindings/js/JSCustomPositionCallback.h
+++ b/WebCore/bindings/js/JSCustomPositionCallback.h
@@ -44,7 +44,7 @@ class JSCustomPositionCallback : public PositionCallback {
 public:
     static PassRefPtr<JSCustomPositionCallback> create(JSC::JSObject* callback, Frame* frame) { return adoptRef(new JSCustomPositionCallback(callback, frame)); }
     
-    virtual void handleEvent(Geoposition*, bool& raisedException);
+    virtual void handleEvent(Geoposition*);
 
 private:
     JSCustomPositionCallback(JSC::JSObject* callback, Frame*);
-- 
cgit v1.1