Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 492037 - EndUpdateBatch not being called for tree builders in some cases, r=neil,kairo,mossop

Browse Source 
--HG--
extra : rebase_source : 165c6eac689cbffc2007519d5202711017f49edd
This commit is contained in:
Olli Pettay 2009-05-22 12:04:02 +03:00
parent 73d48e2fe4
commit 861ae41fba
2 changed files with 103 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
content/xul/templates/src/crashtests/441785-1.xul
View File

@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait">
<tree flex="20" id="t" ref="urn:data:row" datasources="" seltype="single" >
<tree flex="20" id="t" ref="urn:data:row" datasources="rdf:null" seltype="single">
<treecols>
<treecol flex="1" id="id" label="id" sort="rdf:http://dummy/rdf#id" />
<splitter class="tree-splitter"/>
@ -18,21 +18,95 @@
</treechildren>
</template>
</tree>
<tree flex="20" id="tc" ref="urn:data:row" datasources="rdf:null" seltype="single" flags="dont-build-content">
<treecols>
<treecol flex="1" id="idc" label="id" sort="rdf:http://dummy/rdf#id" />
<splitter class="tree-splitter"/>
<treecol flex="1" id="titlec" label="title" sort="rdf:http://dummy/rdf#title" sortActive="true" sortDirection="ascending" /><splitter class="tree-splitter"/>
</treecols>
<template>
<treechildren>
<treeitem uri="rdf:*" seltype="single">
<treerow >
<treecell label="rdf:http://dummy/rdf#id"/>
<treecell label="rdf:http://dummy/rdf#title"/>
</treerow>
</treeitem>
</treechildren>
</template>
</tree>
<script type="application/x-javascript">
<![CDATA[
var tree = document.getElementById('t');
var buildCount = 0;
var TemplateBuilderListener = {
willRebuild: function(aBuilder) {
},
didRebuild: function(aBuilder) {
++buildCount;
var remove = false;
if (buildCount == 2) {
remove =true;
setTimeout(nextDataSource, 0);
} else if (buildCount == 4) {
remove = true;
setTimeout(continueTest, 0);
}
if (remove) {
var tree = document.getElementById('t');
var treec = document.getElementById('tc');
tree.builder.removeListener(TemplateBuilderListener);
treec.builder.removeListener(TemplateBuilderListener);
}
},
QueryInterface: function (aIID)
{
if (!aIID.equals(Components.interfaces.nsIXULBuilderListener) &&
!aIID.equals(Components.interfaces.nsISupports))
throw Components.results.NS_ERROR_NO_INTERFACE;
return this;
}
};
function runTest() {
var tree = document.getElementById('t');
var treec = document.getElementById('tc');
tree.builder.addListener(TemplateBuilderListener);
treec.builder.addListener(TemplateBuilderListener);
tree.setAttribute('datasources', '441785-1.rdf');
tree.setAttribute('datasources', '441785-2.rdf');
setTimeout('continueTest()', 1000);
treec.setAttribute('datasources', '441785-1.rdf');
}
var oldtreefirstrow, oldtreecfirstrow;
function nextDataSource()
{
var tree = document.getElementById('t');
var treec = document.getElementById('tc');
tree.treeBoxObject.scrollToRow(10);
treec.treeBoxObject.scrollToRow(10);
if (tree.treeBoxObject.getFirstVisibleRow() == 10 &&
treec.treeBoxObject.getFirstVisibleRow() == 10) {
tree.builder.addListener(TemplateBuilderListener);
treec.builder.addListener(TemplateBuilderListener);
tree.setAttribute('datasources', '441785-2.rdf');
treec.setAttribute('datasources', '441785-2.rdf');
}
}
function continueTest() {
if (tree.view && tree.view.rowCount > 1) {
var tree = document.getElementById('t');
var treec = document.getElementById('tc');
// there should only be one row visible in each tree at this point
if (tree.treeBoxObject.getFirstVisibleRow() == 0 &&
treec.treeBoxObject.getFirstVisibleRow() == 0) {
//netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
try {
window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
@ -43,8 +117,9 @@ function continueTest() {
// Hit the bug, crash
// (not exactly the same kind of crash as 441785, but from the same cause)
tree.parentNode.removeChild(tree);
treec.parentNode.removeChild(treec);
document.documentElement.className = "";
}
document.documentElement.className = "";
}
window.addEventListener("load", runTest, false);

44
content/xul/templates/src/nsXULTreeBuilder.cpp
View File

@ -319,6 +319,9 @@ nsXULTreeBuilder::Uninit(PRBool aIsFinal)
if (mBoxObject) {
mBoxObject->BeginUpdateBatch();
mBoxObject->RowCountChanged(0, -count);
if (mBoxObject) {
mBoxObject->EndUpdateBatch();
}
}
nsXULTemplateBuilder::Uninit(aIsFinal);
@ -1349,40 +1352,35 @@ nsXULTreeBuilder::RebuildAll()
if (! mQueryProcessor)
return NS_OK;
if (mBoxObject) {
mBoxObject->BeginUpdateBatch();
}
if (mQueriesCompiled) {
Uninit(PR_FALSE);
}
else if (mBoxObject) {
PRInt32 count = mRows.Count();
mRows.Clear();
mBoxObject->BeginUpdateBatch();
mBoxObject->RowCountChanged(0, -count);
}
nsresult rv = CompileQueries();
if (NS_FAILED(rv))
return rv;
if (NS_SUCCEEDED(rv) && mQuerySets.Length() > 0) {
// Seed the rule network with assignments for the tree row variable
nsAutoString ref;
mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::ref, ref);
if (!ref.IsEmpty()) {
rv = mQueryProcessor->TranslateRef(mDataSource, ref,
getter_AddRefs(mRootResult));
if (NS_SUCCEEDED(rv) && mRootResult) {
OpenContainer(-1, mRootResult);
if (mQuerySets.Length() == 0)
return NS_OK;
nsCOMPtr<nsIRDFResource> rootResource;
GetResultResource(mRootResult, getter_AddRefs(rootResource));
// Seed the rule network with assignments for the tree row variable
nsAutoString ref;
mRoot->GetAttr(kNameSpaceID_None, nsGkAtoms::ref, ref);
if (! ref.IsEmpty()) {
rv = mQueryProcessor->TranslateRef(mDataSource, ref,
getter_AddRefs(mRootResult));
if (NS_FAILED(rv))
return rv;
if (mRootResult) {
OpenContainer(-1, mRootResult);
nsCOMPtr<nsIRDFResource> rootResource;
GetResultResource(mRootResult, getter_AddRefs(rootResource));
mRows.SetRootResource(rootResource);
mRows.SetRootResource(rootResource);
}
}
}
@ -1390,7 +1388,7 @@ nsXULTreeBuilder::RebuildAll()
mBoxObject->EndUpdateBatch();
}
return NS_OK;
return rv;
}
nsresult