diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 2c7fa1b714c..56dfa7fab3b 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -552,8 +552,9 @@ nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext, nsCOMPtr type; aChild->GetTag(*getter_AddRefs(type)); - if ((type != nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::src) || - (type == nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::data)) { + if (((type != nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::src) || + (type == nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::data)) && + mOwnsFrameLoader) { nsHTMLFrameInnerFrame* firstChild = NS_STATIC_CAST(nsHTMLFrameInnerFrame*, mFrames.FirstChild()); diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 2c7fa1b714c..56dfa7fab3b 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -552,8 +552,9 @@ nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext, nsCOMPtr type; aChild->GetTag(*getter_AddRefs(type)); - if ((type != nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::src) || - (type == nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::data)) { + if (((type != nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::src) || + (type == nsHTMLAtoms::object && aAttribute == nsHTMLAtoms::data)) && + mOwnsFrameLoader) { nsHTMLFrameInnerFrame* firstChild = NS_STATIC_CAST(nsHTMLFrameInnerFrame*, mFrames.FirstChild());