diff --git a/dom/base/nsImageLoadingContent.h b/dom/base/nsImageLoadingContent.h index d590421d6658..3424eb594e4f 100644 --- a/dom/base/nsImageLoadingContent.h +++ b/dom/base/nsImageLoadingContent.h @@ -200,8 +200,6 @@ class nsImageLoadingContent : public nsIImageLoadingContent { */ void DestroyImageLoadingContent(); - void ClearBrokenState() { mBroken = false; } - /** * Returns the CORS mode that will be used for all future image loads. The * default implementation returns CORS_NONE unconditionally. diff --git a/dom/html/HTMLImageElement.cpp b/dom/html/HTMLImageElement.cpp index 7abef966389b..0cab0f2b470c 100644 --- a/dom/html/HTMLImageElement.cpp +++ b/dom/html/HTMLImageElement.cpp @@ -525,11 +525,6 @@ nsresult HTMLImageElement::BindToTree(Document* aDocument, nsIContent* aParent, // initaiated by a user interaction. mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput(); - // FIXME: Bug 660963 it would be nice if we could just have - // ClearBrokenState update our state and do it fast... - ClearBrokenState(); - RemoveStatesSilently(NS_EVENT_STATE_BROKEN); - // We still act synchronously for the non-responsive case (Bug // 1076583), but still need to delay if it is unsafe to run // script. diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index 57da3964924d..6b6b23ca2870 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -4339,10 +4339,6 @@ nsresult HTMLInputElement::BindToTree(Document* aDocument, nsIContent* aParent, // initaiated by a user interaction. mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput(); - // FIXME: Bug 660963 it would be nice if we could just have - // ClearBrokenState update our state and do it fast... - ClearBrokenState(); - RemoveStatesSilently(NS_EVENT_STATE_BROKEN); nsContentUtils::AddScriptRunner( NewRunnableMethod("dom::HTMLInputElement::MaybeLoadImage", this, &HTMLInputElement::MaybeLoadImage)); diff --git a/dom/html/reftests/bug1512297-ref.html b/dom/html/reftests/bug1512297-ref.html new file mode 100644 index 000000000000..45026e86cce7 --- /dev/null +++ b/dom/html/reftests/bug1512297-ref.html @@ -0,0 +1,7 @@ + + + + +
ALT
+ + diff --git a/dom/html/reftests/bug1512297.html b/dom/html/reftests/bug1512297.html new file mode 100644 index 000000000000..55d8d4564f70 --- /dev/null +++ b/dom/html/reftests/bug1512297.html @@ -0,0 +1,14 @@ + + + + +
ALT
+ + + diff --git a/dom/html/reftests/reftest.list b/dom/html/reftests/reftest.list index a827b47dc46d..602e2e0267fe 100644 --- a/dom/html/reftests/reftest.list +++ b/dom/html/reftests/reftest.list @@ -64,6 +64,8 @@ pref(permissions.default.image,2) HTTP == bug1196784-with-srcset.html bug1196784 # Test video with rotation information can be rotated. == bug1228601-video-rotation-90.html bug1228601-video-rotated-ref.html +== bug1512297.html bug1512297-ref.html + # Test that dynamically setting body margin attributes updates style appropriately == body-topmargin-dynamic.html body-topmargin-ref.html diff --git a/dom/svg/SVGFEImageElement.cpp b/dom/svg/SVGFEImageElement.cpp index f0e218c27e54..835d70365bcc 100644 --- a/dom/svg/SVGFEImageElement.cpp +++ b/dom/svg/SVGFEImageElement.cpp @@ -142,10 +142,6 @@ nsresult SVGFEImageElement::BindToTree(Document* aDocument, nsIContent* aParent, 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(); - RemoveStatesSilently(NS_EVENT_STATE_BROKEN); nsContentUtils::AddScriptRunner( NewRunnableMethod("dom::SVGFEImageElement::MaybeLoadSVGImage", this, &SVGFEImageElement::MaybeLoadSVGImage)); diff --git a/dom/svg/SVGImageElement.cpp b/dom/svg/SVGImageElement.cpp index e3ae7f94de24..fe294516426e 100644 --- a/dom/svg/SVGImageElement.cpp +++ b/dom/svg/SVGImageElement.cpp @@ -190,10 +190,6 @@ nsresult SVGImageElement::BindToTree(Document* aDocument, nsIContent* aParent, 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(); - RemoveStatesSilently(NS_EVENT_STATE_BROKEN); nsContentUtils::AddScriptRunner( NewRunnableMethod("dom::SVGImageElement::MaybeLoadSVGImage", this, &SVGImageElement::MaybeLoadSVGImage));