wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset b5b7b5523c66 to see if it fixes unit tests.

Browse Source
This commit is contained in:
Ben Turner 2008-10-13 19:54:46 -07:00
parent 0293ef22e1
commit 528a45ba6e
4 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/public/nsIDocument.h
View File

@ -784,7 +784,7 @@ public:
/**
* Enumerate all subdocuments.
* The enumerator callback should return PR_TRUE to continue enumerating, or
* PR_FALSE to stop. This will never get passed a null aDocument.
* PR_FALSE to stop.
*/
typedef PRBool (*nsSubDocEnumFunc)(nsIDocument *aDocument, void *aData);
virtual void EnumerateSubDocuments(nsSubDocEnumFunc aCallback,
@ -1090,7 +1090,7 @@ public:
/**
* Enumerate the external resource documents associated with this document.
* The enumerator callback should return PR_TRUE to continue enumerating, or
* PR_FALSE to stop. This callback will never get passed a null aDocument.
* PR_FALSE to stop.
*/
virtual void EnumerateExternalResources(nsSubDocEnumFunc aCallback,
void* aData) = 0;

3
content/base/src/nsDocument.cpp
View File

@ -813,8 +813,7 @@ ExternalResourceEnumerator(nsIURI* aKey,
{
nsExternalResourceEnumArgs* args =
static_cast<nsExternalResourceEnumArgs*>(aClosure);
PRBool next =
aData->mDocument ? args->callback(aData->mDocument, args->data) : PR_TRUE;
PRBool next = args->callback(aData->mDocument, args->data);
return next ? PL_DHASH_NEXT : PL_DHASH_STOP;
}

1
content/base/test/Makefile.in
View File

@ -228,7 +228,6 @@ _TEST_FILES = test_bug5141.html \
file_XHRDocURI.xml^headers^ \
file_XHRDocURI.text \
file_XHRDocURI.text^headers^ \
test_bug459424.html \
$(NULL)
libs:: $(_TEST_FILES)

38
content/base/test/test_bug459424.html
View File

@ -1,38 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=459424
-->
<head>
<title>Test for Bug 459424</title>
<script type="application/javascript" src="/MochiKit/MochiKit.js"></script>
<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=459424">Mozilla Bug 459424</a>
<p id="display" style="mask: url(no-such-document-I-tell-you#x)"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 459424 **/
SimpleTest.waitForExplicitFinish();
addLoadEvent(function() {
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
var viewer =
window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
.QueryInterface(Components.interfaces.nsIDocShell)
.contentViewer
.QueryInterface(Components.interfaces.nsIMarkupDocumentViewer);
viewer.fullZoom = 2;
is(true, true, "Gotta test something");
SimpleTest.finish();
});
</script>
</pre>
</body>
</html>