[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:25:07 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit fd8550b4376824f0bb094774de0e3f01aa2c88f4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 6 21:36:31 2009 +0000
2009-11-06 Steve Block <steveblock at google.com>
Reviewed by Eric Seidel.
Geolocation error code UNKNOWN_ERROR is deprecated.
https://bugs.webkit.org/show_bug.cgi?id=31184
Update test case of the value of the PositionError.UNKNOWN_ERROR constant in error.html.
Also remove redundant test cases of the value of all PositionError constants.
* fast/dom/Geolocation/resources/error.js: Modified. Update test of value of PositionError.UNKNOWN_ERROR constant.
* fast/dom/Geolocation/error-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/permission-denied-already-error.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/permission-denied-already-error-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/permission-denied-already-success.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/permission-denied-already-success-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/permission-denied.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/permission-denied-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/permission-denied-stops-watches.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/permission-denied-stops-watches-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/reentrant-error.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/reentrant-error-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/timeout-zero.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/timeout-zero-expected.txt: Modified. Expected result for above test.
* fast/dom/Geolocation/resources/watch.js: Modified. Remove tests of the value of PositionError constants.
* fast/dom/Geolocation/watch-expected.txt: Modified. Expected result for above test.
2009-11-06 Steve Block <steveblock at google.com>
Reviewed by Eric Seidel.
Geolocation error code UNKNOWN_ERROR is deprecated.
https://bugs.webkit.org/show_bug.cgi?id=31184
Remove this error code from PositionError, both for use from C++ code and from the JS object.
Updated fast/dom/Geolocation/error.html to test this.
* page/PositionError.h: Modified.
(WebCore::PositionError::): Remove ErrorCode::UNKNOWN_ERROR.
* page/PositionError.idl: Modified. Remove UNKNOWN_ERROR constant.
* page/Geolocation.cpp: Modified.
(WebCore::Geolocation::startRequest): Replace UNKNOWN_ERROR with POSITION_UNAVAILABLE.
* platform/gtk/GeolocationServiceGtk.cpp: Modified.
(WebCore::GeolocationServiceGtk::startUpdating): Replace UNKNOWN_ERROR with POSITION_UNAVAILABLE.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7cf0a49..484f397 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,30 @@
+2009-11-06 Steve Block <steveblock at google.com>
+
+ Reviewed by Eric Seidel.
+
+ Geolocation error code UNKNOWN_ERROR is deprecated.
+ https://bugs.webkit.org/show_bug.cgi?id=31184
+
+ Update test case of the value of the PositionError.UNKNOWN_ERROR constant in error.html.
+ Also remove redundant test cases of the value of all PositionError constants.
+
+ * fast/dom/Geolocation/resources/error.js: Modified. Update test of value of PositionError.UNKNOWN_ERROR constant.
+ * fast/dom/Geolocation/error-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/permission-denied-already-error.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/permission-denied-already-error-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/permission-denied-already-success.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/permission-denied-already-success-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/permission-denied.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/permission-denied-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/permission-denied-stops-watches.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/permission-denied-stops-watches-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/reentrant-error.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/reentrant-error-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/timeout-zero.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/timeout-zero-expected.txt: Modified. Expected result for above test.
+ * fast/dom/Geolocation/resources/watch.js: Modified. Remove tests of the value of PositionError constants.
+ * fast/dom/Geolocation/watch-expected.txt: Modified. Expected result for above test.
+
2009-11-04 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/dom/Geolocation/error-expected.txt b/LayoutTests/fast/dom/Geolocation/error-expected.txt
index 08ef05c..ea5d7d8 100644
--- a/LayoutTests/fast/dom/Geolocation/error-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/error-expected.txt
@@ -6,7 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is mockCode
PASS error.message is mockMessage
-PASS error.UNKNOWN_ERROR is 0
+PASS error.UNKNOWN_ERROR is undefined
PASS error.PERMISSION_DENIED is 1
PASS error.POSITION_UNAVAILABLE is 2
PASS error.TIMEOUT is 3
diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt
index f4b614f..e013242 100644
--- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-error-expected.txt
@@ -6,17 +6,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is error.PERMISSION_DENIED
PASS error.message is "User denied Geolocation"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
PASS error.code is error.PERMISSION_DENIED
PASS error.message is "User denied Geolocation"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt
index 3ea0707..f617a5f 100644
--- a/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/permission-denied-already-success-expected.txt
@@ -6,17 +6,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is error.PERMISSION_DENIED
PASS error.message is "User denied Geolocation"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
PASS error.code is error.PERMISSION_DENIED
PASS error.message is "User denied Geolocation"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt
index b2ce8d1..680aa63 100644
--- a/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/permission-denied-expected.txt
@@ -6,10 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is error.PERMISSION_DENIED
PASS error.message is "User denied Geolocation"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt b/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt
index cf630a7..d8f50ca 100644
--- a/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/permission-denied-stops-watches-expected.txt
@@ -6,10 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is error.PERMISSION_DENIED
PASS error.message is "User denied Geolocation"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt b/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt
index 6aaa17b..7420919 100644
--- a/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/reentrant-error-expected.txt
@@ -6,17 +6,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is mockCode
PASS error.message is mockMessage
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
PASS error.code is mockCode
PASS error.message is mockMessage
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/Geolocation/resources/error.js b/LayoutTests/fast/dom/Geolocation/resources/error.js
index 903796b..c76570b 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/error.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/error.js
@@ -14,7 +14,7 @@ navigator.geolocation.getCurrentPosition(function(p) {
error = e
shouldBe('error.code', 'mockCode');
shouldBe('error.message', 'mockMessage');
- shouldBe('error.UNKNOWN_ERROR', '0');
+ shouldBe('error.UNKNOWN_ERROR', 'undefined');
shouldBe('error.PERMISSION_DENIED', '1');
shouldBe('error.POSITION_UNAVAILABLE', '2');
shouldBe('error.TIMEOUT', '3');
diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-error.js b/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-error.js
index f271965..77c8259 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-error.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-error.js
@@ -12,10 +12,6 @@ navigator.geolocation.getCurrentPosition(function(p) {
error = e
shouldBe('error.code', 'error.PERMISSION_DENIED');
shouldBe('error.message', '"User denied Geolocation"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('');
continueTest();
});
@@ -32,10 +28,6 @@ function continueTest()
error = e
shouldBe('error.code', 'error.PERMISSION_DENIED');
shouldBe('error.message', '"User denied Geolocation"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('<br /><span class="pass">TEST COMPLETE</span>');
window.layoutTestController.notifyDone();
});
diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-success.js b/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-success.js
index 2dd89d9..966c64d 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-success.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/permission-denied-already-success.js
@@ -12,10 +12,6 @@ navigator.geolocation.getCurrentPosition(function(p) {
error = e
shouldBe('error.code', 'error.PERMISSION_DENIED');
shouldBe('error.message', '"User denied Geolocation"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('');
continueTest();
});
@@ -30,10 +26,6 @@ function continueTest()
error = e
shouldBe('error.code', 'error.PERMISSION_DENIED');
shouldBe('error.message', '"User denied Geolocation"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('<br /><span class="pass">TEST COMPLETE</span>');
window.layoutTestController.notifyDone();
});
diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-stops-watches.js b/LayoutTests/fast/dom/Geolocation/resources/permission-denied-stops-watches.js
index 147d669..89e5004 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied-stops-watches.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/permission-denied-stops-watches.js
@@ -20,10 +20,6 @@ navigator.geolocation.watchPosition(function(p) {
error = e
shouldBe('error.code', 'error.PERMISSION_DENIED');
shouldBe('error.message', '"User denied Geolocation"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
// Update the mock Geolocation service to report a new position, then
// yield to allow a chance for the success callback to be invoked.
diff --git a/LayoutTests/fast/dom/Geolocation/resources/permission-denied.js b/LayoutTests/fast/dom/Geolocation/resources/permission-denied.js
index f40de7a..1915469 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/permission-denied.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/permission-denied.js
@@ -11,10 +11,6 @@ navigator.geolocation.getCurrentPosition(function(p) {
error = e
shouldBe('error.code', 'error.PERMISSION_DENIED');
shouldBe('error.message', '"User denied Geolocation"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('<br /><span class="pass">TEST COMPLETE</span>');
window.layoutTestController.notifyDone();
});
diff --git a/LayoutTests/fast/dom/Geolocation/resources/reentrant-error.js b/LayoutTests/fast/dom/Geolocation/resources/reentrant-error.js
index 06f1c22..32858bf 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/reentrant-error.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/reentrant-error.js
@@ -20,10 +20,6 @@ navigator.geolocation.getCurrentPosition(function(p) {
error = e;
shouldBe('error.code', 'mockCode');
shouldBe('error.message', 'mockMessage');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('');
continueTest();
});
@@ -41,10 +37,6 @@ function continueTest() {
error = e;
shouldBe('error.code', 'mockCode');
shouldBe('error.message', 'mockMessage');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('<br /><span class="pass">TEST COMPLETE</span>');
window.layoutTestController.notifyDone();
});
diff --git a/LayoutTests/fast/dom/Geolocation/resources/timeout-zero.js b/LayoutTests/fast/dom/Geolocation/resources/timeout-zero.js
index 32d2366..8a930d9 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/timeout-zero.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/timeout-zero.js
@@ -10,10 +10,6 @@ navigator.geolocation.getCurrentPosition(function(p) {
error = e
shouldBe('error.code', 'error.TIMEOUT');
shouldBe('error.message', '"Timeout expired"');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('<br /><span class="pass">TEST COMPLETE</span>');
window.layoutTestController.notifyDone();
}, {
diff --git a/LayoutTests/fast/dom/Geolocation/resources/watch.js b/LayoutTests/fast/dom/Geolocation/resources/watch.js
index 9d43778..dbf4272 100644
--- a/LayoutTests/fast/dom/Geolocation/resources/watch.js
+++ b/LayoutTests/fast/dom/Geolocation/resources/watch.js
@@ -22,10 +22,6 @@ function checkError(e) {
error = e;
shouldBe('error.code', 'mockCode');
shouldBe('error.message', 'mockMessage');
- shouldBe('error.UNKNOWN_ERROR', '0');
- shouldBe('error.PERMISSION_DENIED', '1');
- shouldBe('error.POSITION_UNAVAILABLE', '2');
- shouldBe('error.TIMEOUT', '3');
debug('');
}
diff --git a/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt b/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt
index 14dcd68..f083301 100644
--- a/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/timeout-zero-expected.txt
@@ -6,10 +6,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS successfullyParsed is true
PASS error.code is error.TIMEOUT
PASS error.message is "Timeout expired"
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/Geolocation/watch-expected.txt b/LayoutTests/fast/dom/Geolocation/watch-expected.txt
index d7a93e8..0f923dc 100644
--- a/LayoutTests/fast/dom/Geolocation/watch-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/watch-expected.txt
@@ -14,10 +14,6 @@ PASS position.coords.accuracy is mockAccuracy
PASS error.code is mockCode
PASS error.message is mockMessage
-PASS error.UNKNOWN_ERROR is 0
-PASS error.PERMISSION_DENIED is 1
-PASS error.POSITION_UNAVAILABLE is 2
-PASS error.TIMEOUT is 3
PASS position.coords.latitude is mockLatitude
PASS position.coords.longitude is mockLongitude
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 904da0f..1176c0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-06 Steve Block <steveblock at google.com>
+
+ Reviewed by Eric Seidel.
+
+ Geolocation error code UNKNOWN_ERROR is deprecated.
+ https://bugs.webkit.org/show_bug.cgi?id=31184
+
+ Remove this error code from PositionError, both for use from C++ code and from the JS object.
+
+ Updated fast/dom/Geolocation/error.html to test this.
+
+ * page/PositionError.h: Modified.
+ (WebCore::PositionError::): Remove ErrorCode::UNKNOWN_ERROR.
+ * page/PositionError.idl: Modified. Remove UNKNOWN_ERROR constant.
+ * page/Geolocation.cpp: Modified.
+ (WebCore::Geolocation::startRequest): Replace UNKNOWN_ERROR with POSITION_UNAVAILABLE.
+ * platform/gtk/GeolocationServiceGtk.cpp: Modified.
+ (WebCore::GeolocationServiceGtk::startUpdating): Replace UNKNOWN_ERROR with POSITION_UNAVAILABLE.
+
2009-11-06 Dirk Schulze <krit at webkit.org>
Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index 9a8a59c..55a016f 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -181,7 +181,7 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi
if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get()))
notifier->startTimerIfNeeded();
else
- notifier->setFatalError(PositionError::create(PositionError::UNKNOWN_ERROR, "Failed to start Geolocation service"));
+ notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "Failed to start Geolocation service"));
}
return notifier.release();
diff --git a/WebCore/page/PositionError.h b/WebCore/page/PositionError.h
index f6f56f0..1467170 100644
--- a/WebCore/page/PositionError.h
+++ b/WebCore/page/PositionError.h
@@ -35,7 +35,6 @@ namespace WebCore {
class PositionError : public RefCounted<PositionError> {
public:
enum ErrorCode {
- UNKNOWN_ERROR = 0,
PERMISSION_DENIED = 1,
POSITION_UNAVAILABLE = 2,
TIMEOUT = 3
diff --git a/WebCore/page/PositionError.idl b/WebCore/page/PositionError.idl
index cb2ef5e..91027df 100644
--- a/WebCore/page/PositionError.idl
+++ b/WebCore/page/PositionError.idl
@@ -31,7 +31,6 @@ module core {
readonly attribute unsigned short code;
readonly attribute DOMString message;
- const unsigned short UNKNOWN_ERROR = 0;
const unsigned short PERMISSION_DENIED = 1;
const unsigned short POSITION_UNAVAILABLE = 2;
const unsigned short TIMEOUT = 3;
diff --git a/WebCore/platform/gtk/GeolocationServiceGtk.cpp b/WebCore/platform/gtk/GeolocationServiceGtk.cpp
index cf35346..edb8d10 100644
--- a/WebCore/platform/gtk/GeolocationServiceGtk.cpp
+++ b/WebCore/platform/gtk/GeolocationServiceGtk.cpp
@@ -86,7 +86,7 @@ bool GeolocationServiceGtk::startUpdating(PositionOptions* options)
g_object_unref(master);
if (!client) {
- setError(PositionError::UNKNOWN_ERROR, "Could not connect to location provider.");
+ setError(PositionError::POSITION_UNAVAILABLE, "Could not connect to location provider.");
return false;
}
@@ -101,14 +101,14 @@ bool GeolocationServiceGtk::startUpdating(PositionOptions* options)
true, GEOCLUE_RESOURCE_ALL, &error.outPtr());
if (!result) {
- setError(PositionError::UNKNOWN_ERROR, error->message);
+ setError(PositionError::POSITION_UNAVAILABLE, error->message);
g_object_unref(client);
return false;
}
m_geocluePosition = geoclue_master_client_create_position(client, &error.outPtr());
if (!m_geocluePosition) {
- setError(PositionError::UNKNOWN_ERROR, error->message);
+ setError(PositionError::POSITION_UNAVAILABLE, error->message);
g_object_unref(client);
return false;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list