From 3796c7c4291f08ae033d15b7d448079a18167339 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Thu, 18 Apr 2002 21:54:48 +0000 Subject: [PATCH] One more minor tweak for blocker bug 138007. Making iframe.src=... not load the src twice when the iframe is visible. r=jkeiser@netscape.com, sr=heikki@netscape.com git-svn-id: svn://10.0.0.236/trunk@119308 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrameFrame.cpp | 5 +++-- mozilla/layout/html/document/src/nsFrameFrame.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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());