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

Fxing bug 249332. Don't use getters/setters for link.href in browser code. r=caillon@aillon.org, sr=dveditz@cruzio.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@163970 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com 2004-10-18 18:59:30 +00:00
parent c3f4694a93
commit 66385860a6
3 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/browser/base/content/browser-scripts.inc
View File

@ -45,4 +45,4 @@
<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
<script type="application/x-javascript" src="chrome://browser/content/contentAreaUtils.js"/>
<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>

69
mozilla/browser/base/content/browser.js
View File

@ -3545,12 +3545,14 @@ nsContextMenu.prototype = {
if ( !link.protocol ) {
// We must resort to testing the URL string :-(.
var protocol;
if ( link.href ) {
protocol = link.href.substr( 0, linktype.length );
var wrapper = new XPCNativeWrapper(link, "href",
"getAttributeNS()");
if (wrapper.href) {
protocol = wrapper.href.substr(0, linktype.length);
} else {
protocol = link.getAttributeNS("http://www.w3.org/1999/xlink","href");
if ( protocol ) {
protocol = protocol.substr( 0, linktype.length );
protocol = wrapper.getAttributeNS("http://www.w3.org/1999/xlink","href");
if (protocol) {
protocol = protocol.substr(0, linktype.length);
}
}
return protocol.toLowerCase() === linktype;
@ -3795,14 +3797,17 @@ nsContextMenu.prototype = {
},
// Generate fully-qualified URL for clicked-on link.
linkURL : function () {
if (this.link.href) {
return this.link.href;
var wrapper = new XPCNativeWrapper(this.link, "href", "baseURI",
"getAttributeNS()");
if (wrapper.href) {
return wrapper.href;
}
var href = this.link.getAttributeNS("http://www.w3.org/1999/xlink","href");
var href = wrapper.getAttributeNS("http://www.w3.org/1999/xlink",
"href");
if (!href || !href.match(/\S/)) {
throw "Empty href"; // Without this we try to save as the current doc, for example, HTML case also throws if empty
}
href = makeURLAbsolute(this.link.baseURI,href);
href = makeURLAbsolute(wrapper.baseURI, href);
return href;
},
// Get text of link.
@ -3813,12 +3818,16 @@ nsContextMenu.prototype = {
if (!text || !text.match(/\S/)) {
text = this.link.getAttribute("alt");
if (!text || !text.match(/\S/)) {
if (this.link.href) {
text = this.link.href;
var wrapper = new XPCNativeWrapper(this.link, "href", "baseURI",
"getAttributeNS()");
if (wrapper.href) {
text = wrapper.href;
} else {
text = getAttributeNS("http://www.w3.org/1999/xlink", "href");
text = wrapper.getAttributeNS("http://www.w3.org/1999/xlink",
"href");
if (text && text.match(/\S/)) {
text = makeURLAbsolute(this.link.baseURI, text);
text = makeURLAbsolute(wrapper.baseURI, text);
}
}
}
@ -4033,6 +4042,7 @@ function asyncOpenWebPanel(event)
break;
}
if (linkNode) {
var wrapper = new XPCNativeWrapper(linkNode, "href", "getAttribute()");
if (event.button == 0 && !event.ctrlKey && !event.shiftKey &&
!event.altKey && !event.metaKey) {
// A Web panel's links should target the main content area. Do this
@ -4045,13 +4055,13 @@ function asyncOpenWebPanel(event)
(!target || target == "_content" || target == "_main"))
// IE uses _main, SeaMonkey uses _content, we support both
{
if (!linkNode.href) return true;
if (!wrapper.href) return true;
if (linkNode.getAttribute("onclick")) return true;
var postData = { };
var url = getShortcutOrURI(linkNode.href, postData);
var url = getShortcutOrURI(wrapper.href, postData);
if (!url)
return true;
markLinkVisited(linkNode.href, linkNode);
markLinkVisited(wrapper.href, linkNode);
loadURI(url, null, postData.value);
event.preventDefault();
return false;
@ -4062,21 +4072,23 @@ function asyncOpenWebPanel(event)
// title attribute contains the title that should be used for the sidebar panel.
openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
"centerscreen,chrome,dialog,resizable,dependent",
linkNode.getAttribute("title"),
linkNode.href, null, null, null, null, true);
wrapper.getAttribute("title"),
wrapper.href, null, null, null, null, true);
event.preventDefault();
return false;
}
else if (target == "_search") {
// Used in WinIE as a way of transiently loading pages in a sidebar. We
// mimic that WinIE functionality here and also load the page transiently.
openWebPanel(gNavigatorBundle.getString("webPanels"), linkNode.href);
openWebPanel(gNavigatorBundle.getString("webPanels"), wrapper.href);
event.preventDefault();
return false;
}
}
else
handleLinkClick(event, linkNode.href, linkNode);
else {
handleLinkClick(event, wrapper.href, linkNode);
}
return true;
} else {
// Try simple XLink
@ -4084,13 +4096,16 @@ function asyncOpenWebPanel(event)
linkNode = target;
while (linkNode) {
if (linkNode.nodeType == Node.ELEMENT_NODE) {
href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
var wrapper = new XPCNativeWrapper(linkNode, "getAttributeNS()");
href = wrapper.getAttributeNS("http://www.w3.org/1999/xlink", "href");
break;
}
linkNode = linkNode.parentNode;
}
if (href && href != "") {
href = makeURLAbsolute(target.baseURI,href);
var baseURI = new XPCNativeWrapper(linkNode, "baseURI").baseURI;
href = makeURLAbsolute(baseURI, href);
handleLinkClick(event, href, null);
return true;
}
@ -4994,9 +5009,11 @@ function livemarkOnLinkAdded(event)
livemarkLinks = browserForLink.livemarkLinks;
}
livemarkLinks.push({ href: event.target.href,
type: event.target.type,
title: event.target.title});
var wrapper = new XPCNativeWrapper(event.target, "href", "type", "title");
livemarkLinks.push({ href: wrapper.href,
type: wrapper.type,
title: wrapper.title});
browserForLink.livemarkLinks = livemarkLinks;
if (browserForLink == gBrowser || browserForLink == gBrowser.mCurrentBrowser)

8
mozilla/xpfe/communicator/resources/content/contentAreaClick.js
View File

@ -150,19 +150,21 @@
}
var href;
if (linkNode) {
href = linkNode.href;
href = new XPCNativeWrapper(linkNode, "href").href;
} else {
// Try simple XLink
linkNode = target;
while (linkNode) {
if (linkNode.nodeType == Node.ELEMENT_NODE) {
href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
var wrapper = new XPCNativeWrapper(linkNode, "getAttributeNS()");
href = wrapper.getAttributeNS("http://www.w3.org/1999/xlink", "href");
break;
}
linkNode = linkNode.parentNode;
}
if (href && href != "") {
href = makeURLAbsolute(target.baseURI,href);
var baseURI = new XPCNativeWrapper(linkNode, "baseURI").baseURI;
href = makeURLAbsolute(baseURI, href);
}
}
return href;