Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 349419: add nsIDocShellLoadInfo type for fixup, to silence an assertion that occurs any time a URI is fixed up, r=biesi, sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@208997 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com
2006-09-01 15:58:18 +00:00
parent 9e38970a99
commit 1d38e72bdb
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -537,6 +537,9 @@ ConvertDocShellLoadInfoToLoadType(nsDocShellInfoLoadType aDocShellLoadType)
case nsIDocShellLoadInfo::loadNormalExternal:
loadType = LOAD_NORMAL_EXTERNAL;
break;
case nsIDocShellLoadInfo::loadNormalAllowFixup:
loadType = LOAD_NORMAL_FIXUP;
break;
case nsIDocShellLoadInfo::loadHistory:
loadType = LOAD_HISTORY;
break;
@@ -601,6 +604,9 @@ nsDocShell::ConvertLoadTypeToDocShellLoadInfo(PRUint32 aLoadType)
case LOAD_NORMAL_EXTERNAL:
docShellLoadType = nsIDocShellLoadInfo::loadNormalExternal;
break;
case LOAD_NORMAL_FIXUP:
docShellLoadType = nsIDocShellLoadInfo::loadNormalAllowFixup;
break;
case LOAD_NORMAL_BYPASS_CACHE:
docShellLoadType = nsIDocShellLoadInfo::loadNormalBypassCache;
break;