From bd3e148ac896fa6756a86c9323a92e65bc2fa30a Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Tue, 9 Nov 1999 23:49:37 +0000 Subject: [PATCH] I checked in a bad fix. This is correct. I have had Chris K. check it over. Migrains will do that to you. for bug 18039 git-svn-id: svn://10.0.0.236/trunk@53035 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 4 ++-- mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index eac0d9744e7..98d023be9e4 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -5406,8 +5406,8 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext, // WipeContainingBlock because it will throw away the entire selct frame and // start over which is something we do not want to do // - nsCOMPtr selectContent(do_QueryInterface(blockContent)); - if (selectContent) { + nsCOMPtr selectContent(do_QueryInterface(aContainer)); + if (!selectContent) { if (WipeContainingBlock(aPresContext, state, blockContent, adjustedParentFrame, frameItems.childList)) { return NS_OK; diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index eac0d9744e7..98d023be9e4 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -5406,8 +5406,8 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext, // WipeContainingBlock because it will throw away the entire selct frame and // start over which is something we do not want to do // - nsCOMPtr selectContent(do_QueryInterface(blockContent)); - if (selectContent) { + nsCOMPtr selectContent(do_QueryInterface(aContainer)); + if (!selectContent) { if (WipeContainingBlock(aPresContext, state, blockContent, adjustedParentFrame, frameItems.childList)) { return NS_OK;