Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out a few of my patches to see if any caused the Tdhtml regression in bug 331364.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@192842 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cvshook%sicking.cc
2006-03-23 08:21:21 +00:00
parent 60d1fa7f53
commit e2c22d1f10
26 changed files with 855 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/content/xml/document/src/nsXMLDocument.cpp
View File

@@ -546,7 +546,7 @@ nsXMLDocument::Load(const nsAString& aUrl, PRBool *aReturn)
mEventQService->PopThreadEventQueue(modalEventQueue);
// We set return to true unless there was a parsing error
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(GetRootContent());
nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mRootContent);
if (node) {
nsAutoString name, ns;
if (NS_SUCCEEDED(node->GetLocalName(name)) &&
@@ -771,15 +771,14 @@ nsXMLDocument::GetElementById(const nsAString& aElementId,
// If we tried to load a document and something went wrong, we might not have
// root content. This can happen when you do document.load() and the document
// to load is not XML, for example.
nsIContent* root = GetRootContent();
if (!root)
if (!mRootContent)
return NS_OK;
// XXX For now, we do a brute force search of the content tree.
// We should come up with a more efficient solution.
// Note that content is *not* refcounted here, so do *not* release it!
nsIContent *content =
nsContentUtils::MatchElementId(root, aElementId);
nsContentUtils::MatchElementId(mRootContent, aElementId);
if (!content) {
return NS_OK;