Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out the patch for bug 211128 to fix bug 293639. r=sicking, sr=peterv, a=asa

Browse Source
This commit is contained in:
bzbarsky%mit.edu 2005-05-19 16:12:13 +00:00
parent d2b55edfe0
commit 006aed48be
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
content/base/src/nsGenericElement.cpp
View File

@ -80,7 +80,6 @@
#include "nsIBindingManager.h"
#include "nsXBLBinding.h"
#include "nsXBLPrototypeBinding.h"
#include "nsIDOMCSSStyleDeclaration.h"
#include "nsIDOMViewCSS.h"
#include "nsIXBLService.h"
@ -2380,38 +2379,13 @@ nsGenericElement::GetBaseURI() const
return nsnull;
}
// Our base URL depends on whether we have an xml:base attribute, as well as
// on whether any of our ancestors do. The basic idea is to ask our parent
// (GetParent() if we have one, our document otherwise) for its base
// URL. Then we resolve our xml:base attr, if any, relative to that.
// The one complication is that we may be an anonymous node bound via XBL.
// If this is the case, we still want to use our parent's baseURL unless our
// parent is not part of our own binding (eg is the element the binding is
// attached to). If that is the case, we want to use the binding url as the
// "parent" url.
// Our base URL depends on whether we have an xml:base attribute, as
// well as on whether any of our ancestors do.
nsCOMPtr<nsIURI> parentBase;
nsIContent *parent = GetParent();
nsCOMPtr<nsIURI> parentBase;
if (parent) {
// XXX Not all things with a bindingParent are actually XBL anonymous
// content, so we may not end up getting a binding in the case when we have
// a bindingParent... This seems very wrong. Perhaps it should be fixed?
if (!IsNativeAnonymous()) {
nsIContent* bindingParent = GetBindingParent();
nsIContent* parentsBindingParent = parent->GetBindingParent();
if (bindingParent != parentsBindingParent) {
nsXBLBinding* binding =
doc->BindingManager()->GetBinding(bindingParent);
if (binding) {
parentBase = binding->PrototypeBinding()->BindingURI();
}
}
}
if (!parentBase) {
parentBase = parent->GetBaseURI();
}
parentBase = parent->GetBaseURI();
} else {
// No parent, so just use the document (we must be the root or not in the
// tree).