mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

put in a VERY temporary work-around for some crashes we're seeing as a 

result of table style context's display type != TABLE
This commit is contained in:
buster%netscape.com 1998-11-20 21:08:06 +00:00
Родитель 9fe1e3b039
Коммит aa0ff99ae0
3 изменённых файлов: 30 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
content/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -964,8 +964,12 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
NS_NewTableFrame(aContent, aNewFrame, innerFrame);
childList = innerFrame;
// Have the inner table frame use the same style context as the outer table frame
innerFrame->SetStyleContext(aPresContext, aStyleContext);
// Have the inner table frame use a pseudo style context based on the outer table frame's
nsIStyleContext *innerTableStyleContext =
aPresContext->ResolvePseudoStyleContextFor (aContent,
nsHTMLAtoms::tablePseudo,
aStyleContext);
innerFrame->SetStyleContext(aPresContext, aStyleContext);//innerTableStyleContext);
// Iterate the child content
nsIFrame* lastChildFrame = nsnull;
@ -1673,6 +1677,9 @@ 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;
@ -1713,7 +1720,7 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
// If we're paginated then don't ever make the BODY scrollable
// XXX Use a special BODY rule for paged media...
if (!(aPresContext->IsPaginated() && (nsHTMLAtoms::body == tag))) {
if (display->IsBlockLevel() && IsScrollable(aPresContext, display)) {
if ((display->mDisplay!=NS_STYLE_DISPLAY_TABLE) && display->IsBlockLevel() && IsScrollable(aPresContext, display)) {
// Create a scroll frame which will wrap the frame that needs to
// be scrolled
if NS_SUCCEEDED(NS_NewScrollFrame(aContent, aParentFrame, scrollFrame)) {

13
layout/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -964,8 +964,12 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
NS_NewTableFrame(aContent, aNewFrame, innerFrame);
childList = innerFrame;
// Have the inner table frame use the same style context as the outer table frame
innerFrame->SetStyleContext(aPresContext, aStyleContext);
// Have the inner table frame use a pseudo style context based on the outer table frame's
nsIStyleContext *innerTableStyleContext =
aPresContext->ResolvePseudoStyleContextFor (aContent,
nsHTMLAtoms::tablePseudo,
aStyleContext);
innerFrame->SetStyleContext(aPresContext, aStyleContext);//innerTableStyleContext);
// Iterate the child content
nsIFrame* lastChildFrame = nsnull;
@ -1673,6 +1677,9 @@ 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;
@ -1713,7 +1720,7 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
// If we're paginated then don't ever make the BODY scrollable
// XXX Use a special BODY rule for paged media...
if (!(aPresContext->IsPaginated() && (nsHTMLAtoms::body == tag))) {
if (display->IsBlockLevel() && IsScrollable(aPresContext, display)) {
if ((display->mDisplay!=NS_STYLE_DISPLAY_TABLE) && display->IsBlockLevel() && IsScrollable(aPresContext, display)) {
// Create a scroll frame which will wrap the frame that needs to
// be scrolled
if NS_SUCCEEDED(NS_NewScrollFrame(aContent, aParentFrame, scrollFrame)) {

13
layout/style/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -964,8 +964,12 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
NS_NewTableFrame(aContent, aNewFrame, innerFrame);
childList = innerFrame;
// Have the inner table frame use the same style context as the outer table frame
innerFrame->SetStyleContext(aPresContext, aStyleContext);
// Have the inner table frame use a pseudo style context based on the outer table frame's
nsIStyleContext *innerTableStyleContext =
aPresContext->ResolvePseudoStyleContextFor (aContent,
nsHTMLAtoms::tablePseudo,
aStyleContext);
innerFrame->SetStyleContext(aPresContext, aStyleContext);//innerTableStyleContext);
// Iterate the child content
nsIFrame* lastChildFrame = nsnull;
@ -1673,6 +1677,9 @@ 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;
@ -1713,7 +1720,7 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
// If we're paginated then don't ever make the BODY scrollable
// XXX Use a special BODY rule for paged media...
if (!(aPresContext->IsPaginated() && (nsHTMLAtoms::body == tag))) {
if (display->IsBlockLevel() && IsScrollable(aPresContext, display)) {
if ((display->mDisplay!=NS_STYLE_DISPLAY_TABLE) && display->IsBlockLevel() && IsScrollable(aPresContext, display)) {
// Create a scroll frame which will wrap the frame that needs to
// be scrolled
if NS_SUCCEEDED(NS_NewScrollFrame(aContent, aParentFrame, scrollFrame)) {