From e045622d4e69fce9b6bb72441b0a32de7b5b0703 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Thu, 20 Jun 2002 20:34:37 +0000 Subject: [PATCH] Bug 152979, r=dbaron,chak, sr=waterson git-svn-id: svn://10.0.0.236/trunk@123712 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 10 ++++++---- mozilla/layout/html/base/src/nsBlockFrame.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 812abfe3f5e..bb0d7b0bdd4 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -61,7 +61,6 @@ #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" #include "nsIDOMEvent.h" -#include "nsIDOMHTMLTableCellElement.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" @@ -6568,9 +6567,12 @@ nsBlockFrame::IsTDTableCellBlock(nsIFrame& aFrame) if (nsLayoutAtoms::tableCellFrame == frameType) { nsCOMPtr content; aFrame.GetContent(getter_AddRefs(content)); - nsCOMPtr cellContent(do_QueryInterface(content)); - if (cellContent) { - return PR_TRUE; + if (content && content->IsContentOfType(nsIContent::eHTML)) { + nsCOMPtr tag; + content->GetTag(*getter_AddRefs(tag)); + if (tag == nsHTMLAtoms::td) { + return PR_TRUE; + } } } } diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 812abfe3f5e..bb0d7b0bdd4 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -61,7 +61,6 @@ #include "nsHTMLAtoms.h" #include "nsHTMLValue.h" #include "nsIDOMEvent.h" -#include "nsIDOMHTMLTableCellElement.h" #include "nsIHTMLContent.h" #include "prprf.h" #include "nsLayoutAtoms.h" @@ -6568,9 +6567,12 @@ nsBlockFrame::IsTDTableCellBlock(nsIFrame& aFrame) if (nsLayoutAtoms::tableCellFrame == frameType) { nsCOMPtr content; aFrame.GetContent(getter_AddRefs(content)); - nsCOMPtr cellContent(do_QueryInterface(content)); - if (cellContent) { - return PR_TRUE; + if (content && content->IsContentOfType(nsIContent::eHTML)) { + nsCOMPtr tag; + content->GetTag(*getter_AddRefs(tag)); + if (tag == nsHTMLAtoms::td) { + return PR_TRUE; + } } } }