diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp index 74dfb8980f7..d5c2cf13e9a 100644 --- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp @@ -969,7 +969,8 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext, aPresContext->ResolvePseudoStyleContextFor (aContent, nsHTMLAtoms::tablePseudo, aStyleContext); - innerFrame->SetStyleContext(aPresContext, aStyleContext);//innerTableStyleContext); + innerFrame->SetStyleContext(aPresContext, aStyleContext); + // this should be "innerTableStyleContext" but I haven't tested that thoroughly yet // Iterate the child content nsIFrame* lastChildFrame = nsnull; @@ -1677,9 +1678,6 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext, // any frame at all. const nsStyleDisplay* display = (const nsStyleDisplay*) styleContext->GetStyleData(eStyleStruct_Display); - if (NS_STYLE_DISPLAY_TABLE==display->mDisplay) { - printf ("HELP!!!\n"); - } if (NS_STYLE_DISPLAY_NONE == display->mDisplay) { aFrameSubTree = nsnull; rv = NS_OK; diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp index 74dfb8980f7..d5c2cf13e9a 100644 --- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp @@ -969,7 +969,8 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext, aPresContext->ResolvePseudoStyleContextFor (aContent, nsHTMLAtoms::tablePseudo, aStyleContext); - innerFrame->SetStyleContext(aPresContext, aStyleContext);//innerTableStyleContext); + innerFrame->SetStyleContext(aPresContext, aStyleContext); + // this should be "innerTableStyleContext" but I haven't tested that thoroughly yet // Iterate the child content nsIFrame* lastChildFrame = nsnull; @@ -1677,9 +1678,6 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext, // any frame at all. const nsStyleDisplay* display = (const nsStyleDisplay*) styleContext->GetStyleData(eStyleStruct_Display); - if (NS_STYLE_DISPLAY_TABLE==display->mDisplay) { - printf ("HELP!!!\n"); - } if (NS_STYLE_DISPLAY_NONE == display->mDisplay) { aFrameSubTree = nsnull; rv = NS_OK; diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp index 74dfb8980f7..d5c2cf13e9a 100644 --- a/mozilla/layout/style/nsHTMLStyleSheet.cpp +++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp @@ -969,7 +969,8 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext, aPresContext->ResolvePseudoStyleContextFor (aContent, nsHTMLAtoms::tablePseudo, aStyleContext); - innerFrame->SetStyleContext(aPresContext, aStyleContext);//innerTableStyleContext); + innerFrame->SetStyleContext(aPresContext, aStyleContext); + // this should be "innerTableStyleContext" but I haven't tested that thoroughly yet // Iterate the child content nsIFrame* lastChildFrame = nsnull; @@ -1677,9 +1678,6 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext, // any frame at all. const nsStyleDisplay* display = (const nsStyleDisplay*) styleContext->GetStyleData(eStyleStruct_Display); - if (NS_STYLE_DISPLAY_TABLE==display->mDisplay) { - printf ("HELP!!!\n"); - } if (NS_STYLE_DISPLAY_NONE == display->mDisplay) { aFrameSubTree = nsnull; rv = NS_OK;