[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
sfalken at apple.com
sfalken at apple.com
Thu Feb 4 21:25:38 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 641729da2a764db83a0b3ae7c5fcb47111b550f4
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 23 01:07:07 2010 +0000
https://bugs.webkit.org/show_bug.cgi?id=34024
Layout tests don't easily allow Geolocation to be on in only a subset of platforms
Reviewed by Darin Adler.
* fast/dom/Window/window-properties-geolocation-expected.txt: Added.
* fast/dom/Window/window-properties-geolocation.html: Copied from fast/dom/Window/window-properties.html.
Moved Geolocation property testing here.
* fast/dom/Window/window-properties.html: Exclude Geolocation from testing. Moved to window-properties-geolocation.html.
* fast/dom/navigator-detached-no-crash.html: Exclude Geolocation from output.
* fast/dom/script-tests/prototype-inheritance-2.js: Exclude Geolocation.
* platform/gtk/fast/dom/Window/window-properties-expected.txt: Removed Geolocation properties from expected results.
* platform/gtk/fast/dom/navigator-detached-no-crash-expected.txt: Removed. Gtk results now match baseline.
* platform/gtk/fast/dom/prototype-inheritance-2-expected.txt: Removed Geolocation properties from expected results.
* platform/qt/Skipped: Skip Geolocation tests. Not yet available in Qt.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53740 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 07180fc..a9f9106 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-01-22 Steve Falkenburg <sfalken at apple.com>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34024
+ Layout tests don't easily allow Geolocation to be on in only a subset of platforms
+
+ * fast/dom/Window/window-properties-geolocation-expected.txt: Added.
+ * fast/dom/Window/window-properties-geolocation.html: Copied from fast/dom/Window/window-properties.html.
+ Moved Geolocation property testing here.
+ * fast/dom/Window/window-properties.html: Exclude Geolocation from testing. Moved to window-properties-geolocation.html.
+ * fast/dom/navigator-detached-no-crash.html: Exclude Geolocation from output.
+ * fast/dom/script-tests/prototype-inheritance-2.js: Exclude Geolocation.
+ * platform/gtk/fast/dom/Window/window-properties-expected.txt: Removed Geolocation properties from expected results.
+ * platform/gtk/fast/dom/navigator-detached-no-crash-expected.txt: Removed. Gtk results now match baseline.
+ * platform/gtk/fast/dom/prototype-inheritance-2-expected.txt: Removed Geolocation properties from expected results.
+ * platform/qt/Skipped: Skip Geolocation tests. Not yet available in Qt.
+
2010-01-22 Simon Fraser <simon.fraser at apple.com>
Reviewed by Dan Bernstein.
diff --git a/LayoutTests/fast/dom/Window/window-properties-geolocation-expected.txt b/LayoutTests/fast/dom/Window/window-properties-geolocation-expected.txt
new file mode 100644
index 0000000..e445961
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/window-properties-geolocation-expected.txt
@@ -0,0 +1,8 @@
+This test dumps all of the properties that are reachable from the window.clientInformation.geolocation object, along with their types.
+
+window.clientInformation.geolocation [object Geolocation]
+window.clientInformation.geolocation.clearWatch [function]
+window.clientInformation.geolocation.getCurrentPosition [function]
+window.clientInformation.geolocation.lastPosition [null]
+window.clientInformation.geolocation.watchPosition [function]
+
diff --git a/LayoutTests/fast/dom/Window/window-properties-geolocation.html b/LayoutTests/fast/dom/Window/window-properties-geolocation.html
new file mode 100644
index 0000000..8a6feb6
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/window-properties-geolocation.html
@@ -0,0 +1,94 @@
+<p>This test dumps all of the properties that are reachable from the window.clientInformation.geolocation
+object, along with their types.</p>
+<hr>
+<pre id="pre"></pre>
+
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+var logBuffer = [];
+function log(s)
+{
+ logBuffer.push(s);
+}
+
+var pre = document.getElementById('pre');
+function flushLog()
+{
+ var logMessage = logBuffer.join("");
+ pre.appendChild(document.createTextNode(logMessage));
+}
+
+function tryEval(string)
+{
+ try {
+ return eval(string);
+ } catch (e) {
+ return new String("Caught exception: " + e);
+ }
+}
+
+function typeOfNullAware(value)
+{
+ if (typeof value == "object" && value == null) //;
+ return "null";
+ return typeof value;
+}
+
+function typeStringNullAware(value)
+{
+ var valueType = typeOfNullAware(value);
+ return valueType == "object"
+ ? Object.prototype.toString.call(value)
+ : "[" + valueType + "]";
+}
+
+function logValue(valueName)
+{
+ var value = tryEval(valueName);
+ var valueType = typeOfNullAware(value);
+
+ // Don't taint the test with our own variables
+ if (value == logBuffer || value == pre)
+ return;
+
+ // Don't taint the test with our own properties
+ if (/__visitedByLogValue__/.test(valueName) || /__nameWhenVisitedByLogValue__/.test(valueName))
+ return;
+
+ // Work around Firefox infinite recursion
+ if (/\.[0-9]/.test(valueName))
+ return;
+
+ // Avoid infinite recursion
+ if (valueType == "object" && value.__visitedByLogValue__) { //;
+ log(valueName + " [printed above as " + value.__nameWhenVisitedByLogValue__ + "]\n");
+ return;
+ }
+
+ log(valueName + " " + typeStringNullAware(value) + "\n");
+
+ if (valueType == "object") {
+ value.__visitedByLogValue__ = true;
+ value.__nameWhenVisitedByLogValue__ = valueName;
+ logProperties(value, valueName);
+ }
+}
+
+function logProperties(object, objectName)
+{
+ var array = new Array;
+ for (var property in object) {
+ array.push(property);
+ }
+ array.sort();
+ for (var i = 0; i < array.length; i++) {
+ var property = array[i];
+ logValue(objectName + "." + property);
+ }
+}
+
+logValue('window.clientInformation.geolocation');
+flushLog();
+</script>
diff --git a/LayoutTests/fast/dom/Window/window-properties.html b/LayoutTests/fast/dom/Window/window-properties.html
index 2f197cc..ab93d41 100644
--- a/LayoutTests/fast/dom/Window/window-properties.html
+++ b/LayoutTests/fast/dom/Window/window-properties.html
@@ -71,6 +71,7 @@ var __skip__ = {
"window.WebGLUnsignedByteArray" : 1,
"window.WebGLUnsignedIntArray" : 1,
"window.WebGLUnsignedShortArray" : 1
+ "window.clientInformation.geolocation" : 1
};
function logValue(valueName)
diff --git a/LayoutTests/fast/dom/navigator-detached-no-crash.html b/LayoutTests/fast/dom/navigator-detached-no-crash.html
index afb1d92..9a1706a 100644
--- a/LayoutTests/fast/dom/navigator-detached-no-crash.html
+++ b/LayoutTests/fast/dom/navigator-detached-no-crash.html
@@ -62,9 +62,11 @@ function check_navigator() {
strings.push("navigator."+p+"() threw err "+err);
}
} else {
- var v = old_nav[p];
- // no crash, it is ok.
- strings.push("navigator."+p+" is OK");
+ if (p != "geolocation") { // Don't include geolocation until most platforms have support.
+ var v = old_nav[p];
+ // no crash, it is ok.
+ strings.push("navigator."+p+" is OK");
+ }
}
}
strings.sort();
diff --git a/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js b/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
index c11b231..5d6fddb 100644
--- a/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
+++ b/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
@@ -16,6 +16,8 @@ var skippedProperties = [
"isInner",
// Ignore fooConstructor.prototype, fooInstance.__proto__ is more likely to fail.
"prototype",
+ // Skip Geolocation until it is supported on most platforms.
+ "geolocation",
];
var skippedPropertiesSet = {};
diff --git a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
index 18017d6..236a915 100644
--- a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
+++ b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt
@@ -1643,11 +1643,6 @@ window.clientInformation.appCodeName [string]
window.clientInformation.appName [string]
window.clientInformation.appVersion [string]
window.clientInformation.cookieEnabled [boolean]
-window.clientInformation.geolocation [object Geolocation]
-window.clientInformation.geolocation.clearWatch [function]
-window.clientInformation.geolocation.getCurrentPosition [function]
-window.clientInformation.geolocation.lastPosition [null]
-window.clientInformation.geolocation.watchPosition [function]
window.clientInformation.getStorageUpdates [function]
window.clientInformation.javaEnabled [function]
window.clientInformation.language [string]
diff --git a/LayoutTests/platform/gtk/fast/dom/navigator-detached-no-crash-expected.txt b/LayoutTests/platform/gtk/fast/dom/navigator-detached-no-crash-expected.txt
deleted file mode 100644
index 3b8020c..0000000
--- a/LayoutTests/platform/gtk/fast/dom/navigator-detached-no-crash-expected.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser.
- Check Navigator
-navigator.appCodeName is OK
-navigator.appName is OK
-navigator.appVersion is OK
-navigator.cookieEnabled is OK
-navigator.geolocation is OK
-navigator.getStorageUpdates() is OK
-navigator.javaEnabled() is OK
-navigator.language is OK
-navigator.mimeTypes is OK
-navigator.onLine is OK
-navigator.platform is OK
-navigator.plugins is OK
-navigator.product is OK
-navigator.productSub is OK
-navigator.registerContentHandler() threw err Error: SYNTAX_ERR: DOM Exception 12
-navigator.registerProtocolHandler() threw err Error: SYNTAX_ERR: DOM Exception 12
-navigator.userAgent is OK
-navigator.vendor is OK
-navigator.vendorSub is OK
-navigator.appCodeName is OK
-navigator.appName is OK
-navigator.appVersion is OK
-navigator.cookieEnabled is OK
-navigator.geolocation is OK
-navigator.getStorageUpdates() is OK
-navigator.javaEnabled() is OK
-navigator.language is OK
-navigator.mimeTypes is OK
-navigator.onLine is OK
-navigator.platform is OK
-navigator.plugins is OK
-navigator.product is OK
-navigator.productSub is OK
-navigator.registerContentHandler() is OK
-navigator.registerProtocolHandler() is OK
-navigator.userAgent is OK
-navigator.vendor is OK
-navigator.vendorSub is OK
-
diff --git a/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt
index 46ae04d..d07830a 100644
--- a/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt
+++ b/LayoutTests/platform/gtk/fast/dom/prototype-inheritance-2-expected.txt
@@ -76,8 +76,6 @@ PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__prot
PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__
PASS EventSourceContructor from inner.document.forms.testForm.0.ownerDocument.defaultView.EventSource
FAIL Function from inner.document.location.pathname.constructor
-PASS Geolocation from inner.document.forms.testForm.0.ownerDocument.defaultView.clientInformation.geolocation
-PASS GeolocationPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.clientInformation.geolocation.__proto__
PASS HTMLAnchorElement from inner.document.forms.testForm.0.parentNode.firstElementChild
PASS HTMLAnchorElementConstructor from inner.document.forms.testForm.0.parentNode.firstElementChild.constructor
PASS HTMLAnchorElementPrototype from inner.document.forms.testForm.0.parentNode.firstElementChild.__proto__
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 771ff04..752bf41 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5110,3 +5110,6 @@ fast/frames/sandboxed-iframe-navigation-windowopen.html
# https://bugs.webkit.org/show_bug.cgi?id=34004
# [Qt] http/tests/misc/slow-loading-mask.html timed out.
http/tests/misc/slow-loading-mask.html
+
+# skip Geolocation tests
+fast/dom/Window/window-properties-geolocation.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list