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

When doing a placeholder, paint it and the alt text in the foreground layer, 

not the background one.  Bug 156987, r+sr=roc+moz, a=sspitzer
This commit is contained in:
bzbarsky%mit.edu 2003-05-03 02:34:42 +00:00
Родитель bf7177a438
Коммит 2260b6b2a3
2 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1247,8 +1247,8 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
// First paint background and borders, which should be in the // First paint background and borders, which should be in the
// FOREGROUND or BACKGROUND paint layer if the element is // FOREGROUND or BACKGROUND paint layer if the element is
// inline-level or block-level, respectively. (See CSS2 9.5, which // inline-level or block-level, respectively (bug 36710). (See
// is the rationale for paint layers.) // CSS2 9.5, which is the rationale for paint layers.)
const nsStyleDisplay *display; const nsStyleDisplay *display;
::GetStyleData(mStyleContext, &display); ::GetStyleData(mStyleContext, &display);
nsFramePaintLayer backgroundLayer = display->IsBlockLevel() nsFramePaintLayer backgroundLayer = display->IsBlockLevel()
@ -1285,7 +1285,7 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
imageLoader->GetImageBlocked(&imageBlocked); imageLoader->GetImageBlocked(&imageBlocked);
} }
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer && if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer &&
(!imageBlocked || mIconLoad->mPrefAllImagesBlocked)) { (!imageBlocked || mIconLoad->mPrefAllImagesBlocked)) {
DisplayAltFeedback(aPresContext, aRenderingContext, DisplayAltFeedback(aPresContext, aRenderingContext,
(loadStatus & imgIRequest::STATUS_ERROR) (loadStatus & imgIRequest::STATUS_ERROR)

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

@ -1247,8 +1247,8 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
// First paint background and borders, which should be in the // First paint background and borders, which should be in the
// FOREGROUND or BACKGROUND paint layer if the element is // FOREGROUND or BACKGROUND paint layer if the element is
// inline-level or block-level, respectively. (See CSS2 9.5, which // inline-level or block-level, respectively (bug 36710). (See
// is the rationale for paint layers.) // CSS2 9.5, which is the rationale for paint layers.)
const nsStyleDisplay *display; const nsStyleDisplay *display;
::GetStyleData(mStyleContext, &display); ::GetStyleData(mStyleContext, &display);
nsFramePaintLayer backgroundLayer = display->IsBlockLevel() nsFramePaintLayer backgroundLayer = display->IsBlockLevel()
@ -1285,7 +1285,7 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
imageLoader->GetImageBlocked(&imageBlocked); imageLoader->GetImageBlocked(&imageBlocked);
} }
if (NS_FRAME_PAINT_LAYER_BACKGROUND == aWhichLayer && if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer &&
(!imageBlocked || mIconLoad->mPrefAllImagesBlocked)) { (!imageBlocked || mIconLoad->mPrefAllImagesBlocked)) {
DisplayAltFeedback(aPresContext, aRenderingContext, DisplayAltFeedback(aPresContext, aRenderingContext,
(loadStatus & imgIRequest::STATUS_ERROR) (loadStatus & imgIRequest::STATUS_ERROR)