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

fixes two different checks for the existence of lowsrc. al text now displays 

correctly for net based images.
This commit is contained in:
rods%netscape.com 2000-05-01 14:35:19 +00:00
Родитель 14478883d9
Коммит 27fe983957
2 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -165,7 +165,7 @@ nsImageFrame::Init(nsIPresContext* aPresContext,
} }
} }
if (NS_SUCCEEDED(lowSrcResult)) { if (NS_CONTENT_ATTR_HAS_VALUE == lowSrcResult && lowSrc.Length() > 0) {
mLowSrcImageLoader = new nsHTMLImageLoader; mLowSrcImageLoader = new nsHTMLImageLoader;
if (mLowSrcImageLoader != nsnull) { if (mLowSrcImageLoader != nsnull) {
mLowSrcImageLoader->Init(this, UpdateImageFrame, (void*)mLowSrcImageLoader, baseURL, lowSrc); mLowSrcImageLoader->Init(this, UpdateImageFrame, (void*)mLowSrcImageLoader, baseURL, lowSrc);
@ -212,7 +212,7 @@ nsImageFrame::UpdateImage(nsIPresContext* aPresContext, PRUint32 aStatus, void*
if (aClosure == mLowSrcImageLoader) { if (aClosure == mLowSrcImageLoader) {
// The lowsrc failed to load, but only set the bool to true // The lowsrc failed to load, but only set the bool to true
// true if the src image failed. // true if the src image failed.
imageFailedToLoad = mImageLoader.GetLoadStatus() & NS_IMAGE_LOAD_STATUS_ERROR; imageFailedToLoad = mImageLoader.GetImage() == nsnull || (mImageLoader.GetLoadStatus() & NS_IMAGE_LOAD_STATUS_ERROR);
} else { } else {
// src failed to load, // src failed to load,
// see if the lowsrc is here so we can paint it instead // see if the lowsrc is here so we can paint it instead

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

@ -165,7 +165,7 @@ nsImageFrame::Init(nsIPresContext* aPresContext,
} }
} }
if (NS_SUCCEEDED(lowSrcResult)) { if (NS_CONTENT_ATTR_HAS_VALUE == lowSrcResult && lowSrc.Length() > 0) {
mLowSrcImageLoader = new nsHTMLImageLoader; mLowSrcImageLoader = new nsHTMLImageLoader;
if (mLowSrcImageLoader != nsnull) { if (mLowSrcImageLoader != nsnull) {
mLowSrcImageLoader->Init(this, UpdateImageFrame, (void*)mLowSrcImageLoader, baseURL, lowSrc); mLowSrcImageLoader->Init(this, UpdateImageFrame, (void*)mLowSrcImageLoader, baseURL, lowSrc);
@ -212,7 +212,7 @@ nsImageFrame::UpdateImage(nsIPresContext* aPresContext, PRUint32 aStatus, void*
if (aClosure == mLowSrcImageLoader) { if (aClosure == mLowSrcImageLoader) {
// The lowsrc failed to load, but only set the bool to true // The lowsrc failed to load, but only set the bool to true
// true if the src image failed. // true if the src image failed.
imageFailedToLoad = mImageLoader.GetLoadStatus() & NS_IMAGE_LOAD_STATUS_ERROR; imageFailedToLoad = mImageLoader.GetImage() == nsnull || (mImageLoader.GetLoadStatus() & NS_IMAGE_LOAD_STATUS_ERROR);
} else { } else {
// src failed to load, // src failed to load,
// see if the lowsrc is here so we can paint it instead // see if the lowsrc is here so we can paint it instead