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

Fixes and cleanups required by the infrastructure patch for 281988, r+sr=bsmedberg+bz.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@173634 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2005-05-20 17:41:10 +00:00
parent bb752a5f05
commit 5af9e3746c
16 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1947,7 +1947,8 @@ function checkForDirectoryListing()
{
if ( "HTTPIndex" in content &&
content.HTTPIndex instanceof Components.interfaces.nsIHTTPIndex ) {
content.defaultCharacterset = getMarkupDocumentViewer().defaultCharacterSet;
content.wrappedJSObject.defaultCharacterset =
getMarkupDocumentViewer().defaultCharacterSet;
}
}
@@ -3442,8 +3443,7 @@ nsBrowserAccess.prototype =
.getInterface(nsCI.nsIDOMWindow);
try {
if (aOpener) {
location = Components.lookupMethod(aOpener,"location")
.call(aOpener);
location = aOpener.location;
referrer =
Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService)
@@ -3459,10 +3459,8 @@ nsBrowserAccess.prototype =
default : // OPEN_CURRENTWINDOW or an illegal value
try {
if (aOpener) {
newWindow = Components.lookupMethod(aOpener,"top")
.call(aOpener);
location = Components.lookupMethod(aOpener,"location")
.call(aOpener);
newWindow = aOpener.top;
location = aOpener.location;
referrer =
Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService)
@@ -4155,8 +4153,7 @@ nsContextMenu.prototype = {
if ( !link.protocol ) {
// We must resort to testing the URL string :-(.
var protocol;
var wrapper = new XPCNativeWrapper(link, "href",
"getAttributeNS()");
var wrapper = link;
if (wrapper.href) {
protocol = wrapper.href.substr(0, linktype.length);
} else {
@@ -4217,7 +4214,7 @@ nsContextMenu.prototype = {
// when there is one
var reference = null;
if (context == "selection")
reference = focusedWindow.__proto__.getSelection.call(focusedWindow);
reference = focusedWindow.getSelection();
else if (context == "mathml")
reference = this.target;
else
@@ -4309,8 +4306,7 @@ nsContextMenu.prototype = {
// Let's try to unescape it using a character set
// in case the address is not ASCII.
try {
var characterSet = Components.lookupMethod(this.target.ownerDocument, "characterSet")
.call(this.target.ownerDocument);
var characterSet = this.target.ownerDocument.characterSet;
const textToSubURI = Components.classes["@mozilla.org/intl/texttosuburi;1"]
.getService(Components.interfaces.nsITextToSubURI);
addresses = textToSubURI.unEscapeURIForUI(characterSet, addresses);
@@ -4409,8 +4405,7 @@ nsContextMenu.prototype = {
},
// Generate fully-qualified URL for clicked-on link.
linkURL : function () {
var wrapper = new XPCNativeWrapper(this.link, "href", "baseURI",
"getAttributeNS()");
var wrapper = this.link;
if (wrapper.href) {
return wrapper.href;
}
@@ -4430,8 +4425,7 @@ nsContextMenu.prototype = {
if (!text || !text.match(/\S/)) {
text = this.link.getAttribute("alt");
if (!text || !text.match(/\S/)) {
var wrapper = new XPCNativeWrapper(this.link, "href", "baseURI",
"getAttributeNS()");
var wrapper = this.link;
if (wrapper.href) {
text = wrapper.href;
@@ -4471,7 +4465,7 @@ nsContextMenu.prototype = {
searchSelected : function( charlen ) {
var focusedWindow = document.commandDispatcher.focusedWindow;
var searchStr = focusedWindow.__proto__.getSelection.call(focusedWindow);
var searchStr = focusedWindow.getSelection();
searchStr = searchStr.toString();
// searching for more than 150 chars makes no sense
if (!charlen)
@@ -4635,7 +4629,7 @@ function asyncOpenWebPanel(event)
}
var wrapper = null;
if (linkNode) {
wrapper = new XPCNativeWrapper(linkNode, "href", "getAttribute()", "ownerDocument");
wrapper = linkNode;
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
@@ -4644,8 +4638,8 @@ function asyncOpenWebPanel(event)
// The only reason we field _main and _content here is for the markLinkVisited
// hack.
target = wrapper.getAttribute("target");
var docWrapper = new XPCNativeWrapper(wrapper.ownerDocument, "location");
var locWrapper = new XPCNativeWrapper(docWrapper.location, "href");
var docWrapper = wrapper.ownerDocument;
var locWrapper = docWrapper.location;
if (fieldNormalClicks &&
(!target || target == "_content" || target == "_main"))
// IE uses _main, SeaMonkey uses _content, we support both
@@ -4716,7 +4710,7 @@ function asyncOpenWebPanel(event)
linkNode = target;
while (linkNode) {
if (linkNode.nodeType == Node.ELEMENT_NODE) {
wrapper = new XPCNativeWrapper(linkNode, "getAttributeNS()");
wrapper = linkNode;
href = wrapper.getAttributeNS("http://www.w3.org/1999/xlink", "href");
break;
@@ -4724,7 +4718,7 @@ function asyncOpenWebPanel(event)
linkNode = linkNode.parentNode;
}
if (href) {
var baseURI = new XPCNativeWrapper(linkNode, "baseURI").baseURI;
var baseURI = linkNode.baseURI;
href = makeURLAbsolute(baseURI, href);
handleLinkClick(event, href, null);
return true;
@@ -5377,8 +5371,8 @@ function WindowIsClosing()
var MailIntegration = {
sendLinkForContent: function ()
{
this.sendMessage(Components.lookupMethod(window.content, 'location').call(window.content).href,
Components.lookupMethod(window.content.document, 'title').call(window.content.document));
this.sendMessage(window.content.location.href,
window.content.document.title);
},
sendMessage: function (aBody, aSubject)
@@ -5537,7 +5531,7 @@ function livemarkOnLinkAdded(event)
// mechanism for reading properties of the underlying XPCOM object
// (ignoring potential getters/setters added by malicious content)
var safeGetProperty = function(obj, propname) {
return Components.lookupMethod(obj, propname).call(obj);
return obj[propname];
}
var erel = event.target.rel;
@@ -5579,7 +5573,7 @@ function livemarkOnLinkAdded(event)
livemarkLinks = browserForLink.livemarkLinks;
}
var wrapper = new XPCNativeWrapper(event.target, "href", "type", "title");
var wrapper = event.target;
livemarkLinks.push({ href: wrapper.href,
type: wrapper.type,

1
mozilla/browser/base/content/global-scripts.inc
View File

@@ -46,5 +46,4 @@
<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksMenu.js"/>
<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<script type="application/x-javascript" src="chrome://browser/content/sanitize.js"/>

1
mozilla/browser/base/content/pageInfo.xul
View File

@@ -62,7 +62,6 @@
persist="screenX screenY width height sizemode">
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
<script type="application/x-javascript" src="chrome://browser/content/pageInfo.js"/>

1
mozilla/editor/ui/composer/content/editorOverlay.xul
View File

@@ -53,7 +53,6 @@
<script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<keyset id="editorKeys">
<!-- defined in globalOverlay -->

1
mozilla/editor/ui/dialogs/content/EdPageProps.xul
View File

@@ -54,7 +54,6 @@
<script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EdPageProps.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>

1
mozilla/editor/ui/dialogs/content/EditorPublish.xul
View File

@@ -60,7 +60,6 @@
<script type="application/x-javascript" src="chrome://editor/content/EditorPublish.js"/>
<script type="application/x-javascript" src="chrome://editor/content/publishprefs.js"/>
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>

1
mozilla/editor/ui/dialogs/content/EditorPublishProgress.xul
View File

@@ -58,7 +58,6 @@
<script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EditorPublishProgress.js"/>
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>

1
mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
View File

@@ -57,7 +57,6 @@
<script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<spacer id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>

2
mozilla/toolkit/components/viewsource/content/viewSource.xul
View File

@@ -86,8 +86,6 @@
<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
#else
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
<!-- XPCNativeWrapper.js is needed by xpfe's contentAreaUtils.js (introduced by bug 220215) -->
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
#endif
#ifdef USE_FIND_TOOLBAR

2
mozilla/toolkit/content/widgets/tabbrowser.xml
View File

@@ -834,7 +834,7 @@
<![CDATA[
var browser = this.getBrowserForTab(aTab);
var crop = "end";
var title = browser.contentDocument.__proto__.__lookupGetter__('title').call(browser.contentDocument);
var title = browser.contentDocument.title;
if (!title) {
if (browser.currentURI.spec) {

1
mozilla/xpfe/browser/resources/content/navigator.xul
View File

@@ -89,7 +89,6 @@
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<!-- Shared Bookmarks Utility Library -->
<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>

1
mozilla/xpfe/browser/resources/content/pageInfo.xul
View File

@@ -61,7 +61,6 @@
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
<script type="application/x-javascript" src="chrome://navigator/content/pageInfo.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<stringbundle id="pageinfobundle" src="chrome://navigator/locale/pageInfo.properties"/>

1
mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul
View File

@@ -62,7 +62,6 @@
<script type="application/x-javascript" src="chrome://navigator/content/viewsource.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<commandset id="commands">
<commandset id="globalEditMenuItems"/>

1
mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
View File

@@ -52,7 +52,6 @@
</script>
<script type="application/x-javascript" src="chrome://communicator/content/nsContextMenu.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<popupset id="contentAreaContextSet">
<!-- This is a generic context menu for a content area. It contains

4
mozilla/xpfe/communicator/resources/content/nsContextMenu.js
View File

@@ -559,7 +559,7 @@ nsContextMenu.prototype = {
// when there is one
var reference = null;
if (context == "selection")
reference = focusedWindow.__proto__.getSelection.call(focusedWindow);
reference = focusedWindow.getSelection();
else if (context == "mathml")
reference = this.target;
else
@@ -805,7 +805,7 @@ nsContextMenu.prototype = {
searchSelected : function( charlen ) {
var focusedWindow = document.commandDispatcher.focusedWindow;
var searchStr = focusedWindow.__proto__.getSelection.call(focusedWindow);
var searchStr = focusedWindow.getSelection();
searchStr = searchStr.toString();
// searching for more than 150 chars makes no sense
if (!charlen)

1
mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
View File

@@ -60,7 +60,6 @@
<!-- XXX - would like to cut this dependency out -->
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
<!-- Bookmarks Shell -->
<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>