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

renamed LoadImage to avoid conflicts with windows headers

This commit is contained in:
peterl%netscape.com 1998-07-31 05:55:41 +00:00
Родитель 9dc8df6594
Коммит 66acecae66
2 изменённых файлов: 15 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -217,7 +217,7 @@ nsHTMLImageLoader::SetBaseHREF(const nsString& aBaseHREF)
} }
nsresult nsresult
nsHTMLImageLoader::LoadImage(nsIPresContext* aPresContext, nsHTMLImageLoader::StartLoadImage(nsIPresContext* aPresContext,
nsIFrame* aForFrame, nsIFrame* aForFrame,
PRBool aNeedSizeUpdate, PRBool aNeedSizeUpdate,
PRIntn& aLoadStatus) PRIntn& aLoadStatus)
@ -256,7 +256,7 @@ nsHTMLImageLoader::LoadImage(nsIPresContext* aPresContext,
if (nsnull == mImageLoader) { if (nsnull == mImageLoader) {
// Start image loading. Note that we don't specify a background color // Start image loading. Note that we don't specify a background color
// so transparent images are always rendered using a transparency mask // so transparent images are always rendered using a transparency mask
rv = aPresContext->LoadImage(src, nsnull, aForFrame, aNeedSizeUpdate, rv = aPresContext->StartLoadImage(src, nsnull, aForFrame, aNeedSizeUpdate,
mImageLoader); mImageLoader);
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
@ -274,7 +274,7 @@ nsHTMLImageLoader::LoadImage(nsIPresContext* aPresContext,
else { else {
// Try again, this time using the broke-image url // Try again, this time using the broke-image url
mLoadImageFailed = PR_TRUE; mLoadImageFailed = PR_TRUE;
return LoadImage(aPresContext, aForFrame, aNeedSizeUpdate, aLoadStatus); return StartLoadImage(aPresContext, aForFrame, aNeedSizeUpdate, aLoadStatus);
} }
} }
return NS_OK; return NS_OK;
@ -290,13 +290,13 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext,
PRIntn loadStatus; PRIntn loadStatus;
if (0 != ss) { if (0 != ss) {
if (NS_SIZE_HAS_BOTH == ss) { if (NS_SIZE_HAS_BOTH == ss) {
LoadImage(aPresContext, aReflowState.frame, PR_FALSE, loadStatus); StartLoadImage(aPresContext, aReflowState.frame, PR_FALSE, loadStatus);
aDesiredSize.width = styleSize.width; aDesiredSize.width = styleSize.width;
aDesiredSize.height = styleSize.height; aDesiredSize.height = styleSize.height;
} }
else { else {
// Preserve aspect ratio of image with unbound dimension. // Preserve aspect ratio of image with unbound dimension.
LoadImage(aPresContext, aReflowState.frame, PR_TRUE, loadStatus); StartLoadImage(aPresContext, aReflowState.frame, PR_TRUE, loadStatus);
if ((0 == (loadStatus & NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE)) || if ((0 == (loadStatus & NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE)) ||
(nsnull == mImageLoader)) { (nsnull == mImageLoader)) {
// Provide a dummy size for now; later on when the image size // Provide a dummy size for now; later on when the image size
@ -335,7 +335,7 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext,
} }
} }
else { else {
LoadImage(aPresContext, aReflowState.frame, PR_TRUE, loadStatus); StartLoadImage(aPresContext, aReflowState.frame, PR_TRUE, loadStatus);
if ((0 == (loadStatus & NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE)) || if ((0 == (loadStatus & NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE)) ||
(nsnull == mImageLoader)) { (nsnull == mImageLoader)) {
// Provide a dummy size for now; later on when the image size // Provide a dummy size for now; later on when the image size
@ -863,7 +863,7 @@ ImageFrame::ContentChanged(nsIPresShell* aShell,
// Fire up a new image load request // Fire up a new image load request
PRIntn loadStatus; PRIntn loadStatus;
mImageLoader.SetURL(newSRC); mImageLoader.SetURL(newSRC);
mImageLoader.LoadImage(aPresContext, this, PR_FALSE, loadStatus); mImageLoader.StartLoadImage(aPresContext, this, PR_FALSE, loadStatus);
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("ImageFrame::ContentChanged: loadImage status=%x", ("ImageFrame::ContentChanged: loadImage status=%x",

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

@ -63,7 +63,7 @@ public:
} }
} }
nsresult LoadImage(nsIPresContext* aPresContext, nsresult StartLoadImage(nsIPresContext* aPresContext,
nsIFrame* aForFrame, nsIFrame* aForFrame,
PRBool aNeedSizeUpdate, PRBool aNeedSizeUpdate,
PRIntn& aLoadStatus); PRIntn& aLoadStatus);