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

Display inline borders/background during content painting, not during background painting (per css2 spec)

This commit is contained in:
kipp%netscape.com 1998-12-18 22:12:15 +00:00
Родитель 2c62988710
Коммит 60100e4875
6 изменённых файлов: 24 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) {
if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/generic/nsBlockReflowState.cpp
Просмотреть файл

@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) {
if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/generic/nsBlockReflowState.h
Просмотреть файл

@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) {
if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) {
if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/html/base/src/nsBlockReflowState.cpp
Просмотреть файл

@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) {
if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);

5
layout/html/base/src/nsBlockReflowState.h
Просмотреть файл

@ -3844,7 +3844,10 @@ nsBaseIBFrame::Paint(nsIPresContext& aPresContext,
mStyleContext->GetStyleData(eStyleStruct_Display);
// Only paint the border and background if we're visible
if ((eFramePaintLayer_Underlay == aWhichLayer) && disp->mVisible) {
if (disp->mVisible &&
(((0 != (BLOCK_IS_INLINE & mFlags)) &&
(eFramePaintLayer_Content == aWhichLayer)) ||
(eFramePaintLayer_Underlay == aWhichLayer))) {
PRIntn skipSides = GetSkipSides();
const nsStyleColor* color = (const nsStyleColor*)
mStyleContext->GetStyleData(eStyleStruct_Color);