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

Bug 1245751 - Part 3: Allow href without xlink on SVG <image> elements. r=jwatt

Browse Source 
MozReview-Commit-ID: 1DGZUcJsrDY

--HG--
extra : rebase_source : cc4d79388030d7ce2005f53cafe3cb57a2ce4065
This commit is contained in:
Boris Chiou 2016-07-05 17:35:24 +08:00
parent 31d2e935e7
commit a443d463c1
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dom/svg/SVGImageElement.cpp
View File

@ -37,8 +37,9 @@ nsSVGElement::LengthInfo SVGImageElement::sLengthInfo[4] =
{ &nsGkAtoms::height, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y },
};
nsSVGElement::StringInfo SVGImageElement::sStringInfo[1] =
nsSVGElement::StringInfo SVGImageElement::sStringInfo[2] =
{
{ &nsGkAtoms::href, kNameSpaceID_None, true },
{ &nsGkAtoms::href, kNameSpaceID_XLink, true }
};
@ -108,7 +109,9 @@ SVGImageElement::PreserveAspectRatio()
already_AddRefed<SVGAnimatedString>
SVGImageElement::Href()
{
return mStringAttributes[HREF].ToDOMAnimatedString(this);
return mStringAttributes[HREF].IsExplicitlySet()
? mStringAttributes[HREF].ToDOMAnimatedString(this)
: mStringAttributes[XLINK_HREF].ToDOMAnimatedString(this);
}
//----------------------------------------------------------------------
@ -120,7 +123,11 @@ SVGImageElement::LoadSVGImage(bool aForce, bool aNotify)
nsCOMPtr<nsIURI> baseURI = GetBaseURI();
nsAutoString href;
mStringAttributes[HREF].GetAnimValue(href, this);
if (mStringAttributes[HREF].IsExplicitlySet()) {
mStringAttributes[HREF].GetAnimValue(href, this);
} else {
mStringAttributes[XLINK_HREF].GetAnimValue(href, this);
}
href.Trim(" \t\n\r");
if (baseURI && !href.IsEmpty())
@ -136,7 +143,9 @@ nsresult
SVGImageElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify)
{
if (aNamespaceID == kNameSpaceID_XLink && aName == nsGkAtoms::href) {
if (aName == nsGkAtoms::href &&
(aNamespaceID == kNameSpaceID_None ||
aNamespaceID == kNameSpaceID_XLink)) {
// If there isn't a frame we still need to load the image in case
// the frame is created later e.g. by attaching to a document.
@ -157,7 +166,8 @@ SVGImageElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
void
SVGImageElement::MaybeLoadSVGImage()
{
if (mStringAttributes[HREF].IsExplicitlySet() &&
if ((mStringAttributes[HREF].IsExplicitlySet() ||
mStringAttributes[XLINK_HREF].IsExplicitlySet()) &&
(NS_FAILED(LoadSVGImage(false, true)) ||
!LoadingEnabled())) {
CancelImageRequests(true);
@ -177,7 +187,8 @@ SVGImageElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsImageLoadingContent::BindToTree(aDocument, aParent, aBindingParent,
aCompileEventHandlers);
if (mStringAttributes[HREF].IsExplicitlySet()) {
if (mStringAttributes[HREF].IsExplicitlySet() ||
mStringAttributes[XLINK_HREF].IsExplicitlySet()) {
// FIXME: Bug 660963 it would be nice if we could just have
// ClearBrokenState update our state and do it fast...
ClearBrokenState();

6
dom/svg/SVGImageElement.h
View File

@ -89,9 +89,9 @@ protected:
SVGAnimatedPreserveAspectRatio mPreserveAspectRatio;
enum { HREF };
nsSVGString mStringAttributes[1];
static StringInfo sStringInfo[1];
enum { HREF, XLINK_HREF };
nsSVGString mStringAttributes[2];
static StringInfo sStringInfo[2];
};
} // namespace dom

8
layout/svg/nsSVGImageFrame.cpp
View File

@ -226,11 +226,15 @@ nsSVGImageFrame::AttributeChanged(int32_t aNameSpaceID,
return NS_OK;
}
}
if (aNameSpaceID == kNameSpaceID_XLink &&
if ((aNameSpaceID == kNameSpaceID_XLink ||
aNameSpaceID == kNameSpaceID_None) &&
aAttribute == nsGkAtoms::href) {
SVGImageElement *element = static_cast<SVGImageElement*>(mContent);
if (element->mStringAttributes[SVGImageElement::HREF].IsExplicitlySet()) {
bool hrefIsSet =
element->mStringAttributes[SVGImageElement::HREF].IsExplicitlySet() ||
element->mStringAttributes[SVGImageElement::XLINK_HREF].IsExplicitlySet();
if (hrefIsSet) {
element->LoadSVGImage(true, true);
} else {
element->CancelImageRequests(true);