Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 152979, r=dbaron,chak, sr=waterson

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@123712 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2002-06-20 20:34:37 +00:00
parent 6cf6add6c0
commit e045622d4e
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/layout/generic/nsBlockFrame.cpp
View File

@@ -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<nsIContent> content;
aFrame.GetContent(getter_AddRefs(content));
nsCOMPtr<nsIDOMHTMLTableCellElement> cellContent(do_QueryInterface(content));
if (cellContent) {
return PR_TRUE;
if (content && content->IsContentOfType(nsIContent::eHTML)) {
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
if (tag == nsHTMLAtoms::td) {
return PR_TRUE;
}
}
}
}

10
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@@ -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<nsIContent> content;
aFrame.GetContent(getter_AddRefs(content));
nsCOMPtr<nsIDOMHTMLTableCellElement> cellContent(do_QueryInterface(content));
if (cellContent) {
return PR_TRUE;
if (content && content->IsContentOfType(nsIContent::eHTML)) {
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
if (tag == nsHTMLAtoms::td) {
return PR_TRUE;
}
}
}
}