corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 545593. Remove nsViewManager::Enable/DisableRefresh. r=roc

Browse Source
This commit is contained in:
Timothy Nikkel
2010-02-18 13:23:23 -06:00
parent 9b8f2a9fb2
commit 1a75ee1031
14 changed files with 33 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
parser/html/nsHtml5TreeOpExecutor.cpp
View File

@@ -600,23 +600,17 @@ nsHtml5TreeOpExecutor::NeedsCharsetSwitchTo(const char* aEncoding)
return;
}
nsresult rv = NS_OK;
nsCOMPtr<nsIWebShellServices> wss = do_QueryInterface(mDocShell);
if (!wss) {
return;
}
#ifndef DONT_INFORM_WEBSHELL
// ask the webshellservice to load the URL
if (NS_FAILED(rv = wss->SetRendering(PR_FALSE))) {
// do nothing and fall thru
} else if (NS_FAILED(rv = wss->StopDocumentLoad())) {
rv = wss->SetRendering(PR_TRUE); // turn on the rendering so at least we will see something.
} else if (NS_FAILED(rv = wss->ReloadDocument(aEncoding, kCharsetFromMetaTag))) {
rv = wss->SetRendering(PR_TRUE); // turn on the rendering so at least we will see something.
if (NS_SUCCEEDED(wss->StopDocumentLoad())) {
wss->ReloadDocument(aEncoding, kCharsetFromMetaTag);
}
// if the charset switch was accepted, wss has called Terminate() on the
// parser by now
#endif
if (!mParser) {
// success