From 1a13af65898290409b1532a8de2672812ea59de4 Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Tue, 11 Jul 2000 23:10:29 +0000 Subject: [PATCH] #44422, r=buster --- layout/generic/nsObjectFrame.cpp | 6 +++--- layout/html/base/src/nsObjectFrame.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 90821b3dae9..75c6884ba62 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -523,9 +523,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // could be an image nsIFrame * child = mFrames.FirstChild(); - if(child != nsnull) { - nsresult imageResult = HandleImage(aPresContext, aMetrics, aReflowState, aStatus, child); - } + if(child != nsnull) + return HandleImage(aPresContext, aMetrics, aReflowState, aStatus, child); + // if mInstance is null, we need to determine what kind of object we are and instantiate ourselves if(!mInstanceOwner) { diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp index 90821b3dae9..75c6884ba62 100644 --- a/layout/html/base/src/nsObjectFrame.cpp +++ b/layout/html/base/src/nsObjectFrame.cpp @@ -523,9 +523,9 @@ nsObjectFrame::Reflow(nsIPresContext* aPresContext, // could be an image nsIFrame * child = mFrames.FirstChild(); - if(child != nsnull) { - nsresult imageResult = HandleImage(aPresContext, aMetrics, aReflowState, aStatus, child); - } + if(child != nsnull) + return HandleImage(aPresContext, aMetrics, aReflowState, aStatus, child); + // if mInstance is null, we need to determine what kind of object we are and instantiate ourselves if(!mInstanceOwner) {