wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 971432 - parser changes needed after moving baseURI to nsILoadInfo. r=hsivonen

Browse Source
This commit is contained in:
James Kitchener 2014-10-24 20:39:00 +02:00
parent 564ada5f05
commit 5614b975f1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parser/html/nsHtml5TreeOpExecutor.cpp
View File

@ -29,6 +29,7 @@
#include "nsIScriptContext.h" #include "nsIScriptContext.h"
#include "mozilla/Preferences.h" #include "mozilla/Preferences.h"
#include "nsIHTMLDocument.h" #include "nsIHTMLDocument.h"
#include "nsILoadInfo.h"
using namespace mozilla; using namespace mozilla;
@ -797,12 +798,15 @@ nsHtml5TreeOpExecutor::GetViewSourceBaseURI()
// We query the channel for the baseURI because in certain situations it // We query the channel for the baseURI because in certain situations it
// cannot otherwise be determined. If this process fails, fall back to the // cannot otherwise be determined. If this process fails, fall back to the
// standard method. // standard method.
nsCOMPtr<nsIViewSourceChannel> vsc; nsCOMPtr<nsIChannel> channel = mDocument->GetChannel();
vsc = do_QueryInterface(mDocument->GetChannel()); if (channel) {
if (vsc) { nsCOMPtr<nsILoadInfo> loadInfo;
nsresult rv = vsc->GetBaseURI(getter_AddRefs(mViewSourceBaseURI)); nsresult rv = channel->GetLoadInfo(getter_AddRefs(loadInfo));
if (NS_SUCCEEDED(rv) && mViewSourceBaseURI) { if (NS_SUCCEEDED(rv) && loadInfo) {
return mViewSourceBaseURI; rv = loadInfo->GetBaseURI(getter_AddRefs(mViewSourceBaseURI));
if (NS_SUCCEEDED(rv) && mViewSourceBaseURI) {
return mViewSourceBaseURI;
}
} }
} }