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

Fix to propagate failure from MakeAbsolute to DOM event handler. r=vidur,joki

This commit is contained in:
warren%netscape.com 2000-01-28 06:55:27 +00:00
Родитель 58e2dc9559
Коммит f8b1c9d37f
8 изменённых файлов: 100 добавлений и 102 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

73
content/base/src/nsGenericElement.cpp
Просмотреть файл

@ -1265,7 +1265,7 @@ nsGenericElement::Release()
//----------------------------------------------------------------------
void
nsresult
nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
@ -1273,47 +1273,46 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
const nsString& aTargetSpec,
PRBool aClick)
{
nsILinkHandler* handler;
nsresult rv = aPresContext->GetLinkHandler(&handler);
if (NS_SUCCEEDED(rv) && (nsnull != handler)) {
// Resolve url to an absolute url
nsAutoString absURLSpec;
if (nsnull != aBaseURL) {
rv = NS_MakeAbsoluteURI(aURLSpec, aBaseURL, absURLSpec);
NS_ASSERTION(NS_SUCCEEDED(rv), "XXX make this function return an nsresult, like it should!");
}
else {
absURLSpec = aURLSpec;
}
nsCOMPtr<nsILinkHandler> handler;
nsresult rv = aPresContext->GetLinkHandler(getter_AddRefs(handler));
if (NS_FAILED(rv)) return rv;
// Resolve url to an absolute url
nsAutoString absURLSpec;
if (nsnull != aBaseURL) {
rv = NS_MakeAbsoluteURI(aURLSpec, aBaseURL, absURLSpec);
if (NS_FAILED(rv)) return rv;
}
else {
absURLSpec = aURLSpec;
}
// HACK HACK HACK. If the link clicked is a mailto: url just
// pass the aURLSpec. This is because, netlib doesn't recognize
// mailto: protocol. Note: This s'd go away after NECKO lands
// pass the aURLSpec. This is because, netlib doesn't recognize
// mailto: protocol. Note: This s'd go away after NECKO lands
PRInt32 offset = -1;
offset = aURLSpec.Find("mailto", PR_TRUE);
if (offset >= 0)
absURLSpec = aURLSpec;
PRInt32 offset = -1;
offset = aURLSpec.Find("mailto", PR_TRUE);
if (offset >= 0)
absURLSpec = aURLSpec;
// Now pass on absolute url to the click handler
if (aClick) {
// Check that this page is allowed to load this URI.
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
nsIURI *absURI = nsnull;
if (NS_SUCCEEDED(rv))
rv = NS_NewURI(&absURI, absURLSpec, aBaseURL);
if (NS_SUCCEEDED(rv))
rv = securityManager->CheckLoadURI(aBaseURL, absURI);
if (NS_SUCCEEDED(rv))
handler->OnLinkClick(mContent, aVerb, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
NS_IF_RELEASE(absURI);
}
else {
handler->OnOverLink(mContent, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
}
NS_RELEASE(handler);
// Now pass on absolute url to the click handler
if (aClick) {
// Check that this page is allowed to load this URI.
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
nsCOMPtr<nsIURI> absURI;
if (NS_SUCCEEDED(rv))
rv = NS_NewURI(getter_AddRefs(absURI), absURLSpec, aBaseURL);
if (NS_SUCCEEDED(rv))
rv = securityManager->CheckLoadURI(aBaseURL, absURI);
if (NS_SUCCEEDED(rv))
handler->OnLinkClick(mContent, aVerb, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
}
else {
handler->OnOverLink(mContent, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
}
return rv;
}
nsresult

12
content/base/src/nsGenericElement.h
Просмотреть файл

@ -197,12 +197,12 @@ public:
const nsString& aValue,
REFNSIID aIID);
void TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
const nsString& aURLSpec,
const nsString& aTargetSpec,
PRBool aClick);
nsresult TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
const nsString& aURLSpec,
const nsString& aTargetSpec,
PRBool aClick);
nsresult JoinTextNodes(nsIContent* aFirst,
nsIContent* aSecond);

10
content/html/content/src/nsHTMLAnchorElement.cpp
Просмотреть файл

@ -385,8 +385,8 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
if (target.Length() == 0) {
GetBaseTarget(target);
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_TRUE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
@ -413,8 +413,8 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
if (target.Length() == 0) {
GetBaseTarget(target);
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_FALSE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
@ -429,7 +429,7 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
}
nsAutoString empty;
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;

6
content/xml/content/src/nsXMLElement.cpp
Просмотреть файл

@ -165,7 +165,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
if (nsnull != mInner.mDocument) {
baseURL = mInner.mDocument->GetDocumentURL();
}
mInner.TriggerLink(aPresContext, verb, baseURL, href, target, PR_TRUE);
ret = mInner.TriggerLink(aPresContext, verb, baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
@ -185,7 +185,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
baseURL = mInner.mDocument->GetDocumentURL();
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href, target, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href, target, PR_FALSE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
@ -196,7 +196,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
case NS_MOUSE_EXIT:
{
nsAutoString empty;
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
break;

73
layout/base/src/nsGenericElement.cpp
Просмотреть файл

@ -1265,7 +1265,7 @@ nsGenericElement::Release()
//----------------------------------------------------------------------
void
nsresult
nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
@ -1273,47 +1273,46 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
const nsString& aTargetSpec,
PRBool aClick)
{
nsILinkHandler* handler;
nsresult rv = aPresContext->GetLinkHandler(&handler);
if (NS_SUCCEEDED(rv) && (nsnull != handler)) {
// Resolve url to an absolute url
nsAutoString absURLSpec;
if (nsnull != aBaseURL) {
rv = NS_MakeAbsoluteURI(aURLSpec, aBaseURL, absURLSpec);
NS_ASSERTION(NS_SUCCEEDED(rv), "XXX make this function return an nsresult, like it should!");
}
else {
absURLSpec = aURLSpec;
}
nsCOMPtr<nsILinkHandler> handler;
nsresult rv = aPresContext->GetLinkHandler(getter_AddRefs(handler));
if (NS_FAILED(rv)) return rv;
// Resolve url to an absolute url
nsAutoString absURLSpec;
if (nsnull != aBaseURL) {
rv = NS_MakeAbsoluteURI(aURLSpec, aBaseURL, absURLSpec);
if (NS_FAILED(rv)) return rv;
}
else {
absURLSpec = aURLSpec;
}
// HACK HACK HACK. If the link clicked is a mailto: url just
// pass the aURLSpec. This is because, netlib doesn't recognize
// mailto: protocol. Note: This s'd go away after NECKO lands
// pass the aURLSpec. This is because, netlib doesn't recognize
// mailto: protocol. Note: This s'd go away after NECKO lands
PRInt32 offset = -1;
offset = aURLSpec.Find("mailto", PR_TRUE);
if (offset >= 0)
absURLSpec = aURLSpec;
PRInt32 offset = -1;
offset = aURLSpec.Find("mailto", PR_TRUE);
if (offset >= 0)
absURLSpec = aURLSpec;
// Now pass on absolute url to the click handler
if (aClick) {
// Check that this page is allowed to load this URI.
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
nsIURI *absURI = nsnull;
if (NS_SUCCEEDED(rv))
rv = NS_NewURI(&absURI, absURLSpec, aBaseURL);
if (NS_SUCCEEDED(rv))
rv = securityManager->CheckLoadURI(aBaseURL, absURI);
if (NS_SUCCEEDED(rv))
handler->OnLinkClick(mContent, aVerb, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
NS_IF_RELEASE(absURI);
}
else {
handler->OnOverLink(mContent, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
}
NS_RELEASE(handler);
// Now pass on absolute url to the click handler
if (aClick) {
// Check that this page is allowed to load this URI.
NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
nsCOMPtr<nsIURI> absURI;
if (NS_SUCCEEDED(rv))
rv = NS_NewURI(getter_AddRefs(absURI), absURLSpec, aBaseURL);
if (NS_SUCCEEDED(rv))
rv = securityManager->CheckLoadURI(aBaseURL, absURI);
if (NS_SUCCEEDED(rv))
handler->OnLinkClick(mContent, aVerb, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
}
else {
handler->OnOverLink(mContent, absURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
}
return rv;
}
nsresult

12
layout/base/src/nsGenericElement.h
Просмотреть файл

@ -197,12 +197,12 @@ public:
const nsString& aValue,
REFNSIID aIID);
void TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
const nsString& aURLSpec,
const nsString& aTargetSpec,
PRBool aClick);
nsresult TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
const nsString& aURLSpec,
const nsString& aTargetSpec,
PRBool aClick);
nsresult JoinTextNodes(nsIContent* aFirst,
nsIContent* aSecond);

10
layout/html/content/src/nsHTMLAnchorElement.cpp
Просмотреть файл

@ -385,8 +385,8 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
if (target.Length() == 0) {
GetBaseTarget(target);
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_TRUE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
@ -413,8 +413,8 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
if (target.Length() == 0) {
GetBaseTarget(target);
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_FALSE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
@ -429,7 +429,7 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
}
nsAutoString empty;
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;

6
layout/xml/content/src/nsXMLElement.cpp
Просмотреть файл

@ -165,7 +165,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
if (nsnull != mInner.mDocument) {
baseURL = mInner.mDocument->GetDocumentURL();
}
mInner.TriggerLink(aPresContext, verb, baseURL, href, target, PR_TRUE);
ret = mInner.TriggerLink(aPresContext, verb, baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
@ -185,7 +185,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
baseURL = mInner.mDocument->GetDocumentURL();
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href, target, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href, target, PR_FALSE);
NS_IF_RELEASE(baseURL);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
@ -196,7 +196,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
case NS_MOUSE_EXIT:
{
nsAutoString empty;
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
ret = mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
break;