зеркало из https://github.com/mozilla/gecko-dev.git
Oops. I didn't need to do that.
This commit is contained in:
Родитель
5e98f0dd1e
Коммит
19fa2a5434
|
@ -3374,7 +3374,6 @@ HTMLContentSink::ProcessAREATag(const nsIParserNode& aNode)
|
||||||
void
|
void
|
||||||
HTMLContentSink::ProcessBaseHref(const nsString& aBaseHref)
|
HTMLContentSink::ProcessBaseHref(const nsString& aBaseHref)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
//-- Make sure this page is allowed to load this URL
|
//-- Make sure this page is allowed to load this URL
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
|
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
|
||||||
|
@ -3385,7 +3384,6 @@ HTMLContentSink::ProcessBaseHref(const nsString& aBaseHref)
|
||||||
if (NS_FAILED(rv)) return;
|
if (NS_FAILED(rv)) return;
|
||||||
rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, PR_FALSE);
|
rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, PR_FALSE);
|
||||||
if (NS_FAILED(rv)) return;
|
if (NS_FAILED(rv)) return;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (nsnull == mBody) { // still in real HEAD
|
if (nsnull == mBody) { // still in real HEAD
|
||||||
mHTMLDocument->SetBaseURL(aBaseHref);
|
mHTMLDocument->SetBaseURL(aBaseHref);
|
||||||
|
|
|
@ -3374,7 +3374,6 @@ HTMLContentSink::ProcessAREATag(const nsIParserNode& aNode)
|
||||||
void
|
void
|
||||||
HTMLContentSink::ProcessBaseHref(const nsString& aBaseHref)
|
HTMLContentSink::ProcessBaseHref(const nsString& aBaseHref)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
//-- Make sure this page is allowed to load this URL
|
//-- Make sure this page is allowed to load this URL
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
|
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
|
||||||
|
@ -3385,7 +3384,6 @@ HTMLContentSink::ProcessBaseHref(const nsString& aBaseHref)
|
||||||
if (NS_FAILED(rv)) return;
|
if (NS_FAILED(rv)) return;
|
||||||
rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, PR_FALSE);
|
rv = securityManager->CheckLoadURI(mDocumentBaseURL, baseHrefURI, PR_FALSE);
|
||||||
if (NS_FAILED(rv)) return;
|
if (NS_FAILED(rv)) return;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (nsnull == mBody) { // still in real HEAD
|
if (nsnull == mBody) { // still in real HEAD
|
||||||
mHTMLDocument->SetBaseURL(aBaseHref);
|
mHTMLDocument->SetBaseURL(aBaseHref);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче