| author | Philipp Wagner <mail@philipp-wagner.com> |
| Mon, 30 Jan 2012 15:54:54 +0100 | |
| changeset 88543 | 9b50354e65c85bb1635c20cd416cf2ff66fcf8ba |
| parent 88542 | e73a68477cfd991faf71489890ee3df15c7b5fa8 |
| child 88544 | 4b7d5b27dd5f0a1ce44093de00eb1e5e8469149c |
| push id | 129 |
| push user | ffxbld |
| push date | Fri, 20 Apr 2012 19:40:49 +0000 |
| treeherder | mozilla-release@5bcfa0da3be9 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | jonas |
| bugs | 694754 |
| milestone | 12.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -5842,34 +5842,31 @@ NS_IMETHODIMP nsDocument::SetTextContent(const nsAString & aTextContent) { return nsINode::SetTextContent(aTextContent); } NS_IMETHODIMP nsDocument::LookupPrefix(const nsAString & namespaceURI, nsAString & aResult) { - SetDOMStringToNull(aResult); - return NS_OK; + return nsINode::LookupPrefix(namespaceURI, aResult); } NS_IMETHODIMP nsDocument::IsDefaultNamespace(const nsAString & namespaceURI, bool *aResult) { - *aResult = namespaceURI.IsEmpty(); - return NS_OK; + return nsINode::IsDefaultNamespace(namespaceURI, aResult); } NS_IMETHODIMP nsDocument::LookupNamespaceURI(const nsAString & prefix, nsAString & aResult) { - SetDOMStringToNull(aResult); - return NS_OK; + return nsINode::LookupNamespaceURI(prefix, aResult); } NS_IMETHODIMP nsDocument::SetUserData(const nsAString & key, nsIVariant *data, nsIDOMUserDataHandler *handler, nsIVariant **aResult) { return nsINode::SetUserData(key, data, handler, aResult);
--- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -524,16 +524,17 @@ include $(topsrcdir)/config/rules.mk test_bug684671.html \ test_bug685798.html \ test_bug686449.xhtml \ test_bug690056.html \ test_bug692434.html \ file_bug692434.xml \ test_bug693615.html \ test_bug693875.html \ + test_bug694754.xhtml \ test_bug698384.html \ test_nodelist_holes.html \ test_xhr_abort_after_load.html \ test_bug702439.html \ test_bug702439.html^headers^ \ file_bug702439.html \ test_bug707142.html \ file_bug707142_baseline.json \
new file mode 100644 --- /dev/null +++ b/content/base/test/test_bug694754.xhtml @@ -0,0 +1,70 @@ +<!DOCTYPE HTML> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:test="http://example.com/test"> +<!-- +https://bugzilla.mozilla.org/show_bug.cgi?id=694754 +--> +<head> + <title>Test for Bug 694754</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body> +<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=694754">Mozilla Bug 694754</a> +<p id="display"></p> +<div id="content" style="display: none"> +</div> +<pre id="test"> +<script type="application/javascript"> + +/** Test for Bug 694754 **/ +/* +The following code tests if calling the DOM methods Document::lookupNamespaceURI +and Document::lookupPrefix directly (with quickstubs) and through XPCOM leads +to the same result. + +This test makes use of the bug/feature that deleting a method from the +prototype forces the engine to go through XPCOM. +*/ + +// Document::lookupPrefix called directly (quickstubs) +var prefixDirect = document.lookupPrefix("http://example.com/test"); +is(prefixDirect, "test", + "calling Document::lookupPrefix through quickstubs works"); + +// Document::lookupPrefix called via XPCOM +var proto = Object.getPrototypeOf(document); +delete(proto.lookupPrefix); +var prefixThroughXPCOM = document.lookupPrefix("http://example.com/test"); +is(prefixThroughXPCOM, "test", + "calling Document::lookupPrefix through XPCOM works"); + + + +// Document::lookupNamespaceURI called directly (quickstubs) +var namespaceDirect = document.lookupNamespaceURI(null); +is(namespaceDirect, "http://www.w3.org/1999/xhtml", + "calling Document::lookupNamespaceURI through quickstubs works"); + +// Document::lookupNamespaceURI called via XPCOM +delete(proto.lookupNamespaceURI); +var namespaceThroughXPCOM = document.lookupNamespaceURI(null); +is(namespaceThroughXPCOM, "http://www.w3.org/1999/xhtml", + "calling Document::lookupNamespaceURI through XPCOM works"); + +// Document::isDefaultNamespace called directly (quickstubs) +var isDefaultNamespaceDirect = document.isDefaultNamespace("http://www.w3.org/1999/xhtml"); +is(isDefaultNamespaceDirect, true, + "Default namespace correctly detected through quickstubs"); + +// Document::isDefaultNamespace called via XPCOM +delete(proto.isDefaultNamespace); +var isDefaultNamespaceXPCOM = document.isDefaultNamespace("http://www.w3.org/1999/xhtml"); +is(isDefaultNamespaceXPCOM, true, + "Default namespace correctly detected through XPCOM"); + + +</script> +</pre> +</body> +</html>