Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/appIntegration.js

Issue 8433028: added hook function to appIntegration to handle function-overwrites from other extensions (Closed)
Patch Set: applied code review changes Created Sept. 28, 2012, 8:01 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/content/tests/tests/suffixTreeManipulation.js ('k') | lib/hooks.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/appIntegration.js
===================================================================
--- a/lib/appIntegration.js
+++ b/lib/appIntegration.js
@@ -2,16 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-// Extensions like Tab Mix Plus will try to recompile our handlers and fail
-// badly - they manage to replace our handler but the recompiled version
-// won't work because the closure is missing its variables. We replace
-// toString() function to prevent this kind of recompiling on earlier stages
-// (produce a syntax error but still leave the source code viewable).
-function doNotRecompile()
+let {hook} = require("hooks");
+let functionHooks = new WeakMap();
+
+exports.removeFromWindow = function(window)
{
- let result = Function.prototype.toString.apply(this);
- return result + "\n$%&!/DO_NOT_RECOMPILE"
-}
+ if (functionHooks.has(window))
+ {
+ let unhook = functionHooks.get(window);
+ unhook();
+ functionHooks.delete(window);
+ }
+};
let {application} = require("info");
switch (application)
@@ -28,50 +30,30 @@
exports.applyToWindow = function(window, corrector)
{
let urlbar = exports.getURLBar(window);
- if (urlbar && urlbar.handleCommand && !("urlfixerOldHandler" in urlbar.handleCommand))
+ if (urlbar && urlbar.handleCommand && !functionHooks.has(window))
{
// Handle new URLs being entered
- let oldHandler = urlbar.handleCommand;
- urlbar.handleCommand = function()
+ let unhook = hook(urlbar, "handleCommand", function()
{
- try
- {
- let correction = corrector(window, urlbar.value);
- if (correction)
- urlbar.value = correction;
- }
- catch(e)
- {
- if (e == Cr.NS_BINDING_ABORTED)
- return;
- else
- Cu.reportError(e);
- }
- oldHandler.apply(this, arguments);
- }
- urlbar.handleCommand.urlfixerOldHandler = oldHandler;
- urlbar.handleCommand.toString = doNotRecompile;
+ let correction = corrector(window, urlbar.value);
+ if (correction)
+ urlbar.value = correction;
+ });
+ functionHooks.set(window, unhook);
}
};
- exports.removeFromWindow = function(window)
- {
- let urlbar = exports.getURLBar(window);
- if (urlbar && urlbar.handleCommand && "urlfixerOldHandler" in urlbar.handleCommand)
- urlbar.handleCommand = urlbar.handleCommand.urlfixerOldHandler;
- };
-
exports.openInfobar = function(window, id, message, buttons, persistence)
{
let browser = exports.getBrowser(window);
let infobar = browser.getNotificationBox();
let notif = infobar.getNotificationWithValue(id);
-
+
if (notif)
{
infobar.removeNotification(notif);
}
-
+
notif = infobar.appendNotification(
message,
id,
@@ -81,16 +63,18 @@
);
notif.persistence = persistence;
};
-
- exports.loadURI = function(uri)
+
+ exports.loadURI = function(window, uri)
{
- exports.getBrowser(Services.wm.getMostRecentWindow("navigator:browser")).loadURI(uri);
+ exports.getBrowser(window).loadURI(uri);
};
break;
}
case "seamonkey":
{
+ let eventListeners = new WeakMap();
+
// SeaMonkey
exports.isKnownWindow = function(window) window.document.documentElement.getAttribute("windowtype") == "navigator:browser";
@@ -101,49 +85,60 @@
exports.applyToWindow = function(window, corrector)
{
let urlbar = exports.getURLBar(window);
- if (urlbar && window.handleURLBarCommand && !("urlfixerOldHandler" in window.handleURLBarCommand))
+ let goButton = window.document.getElementById("go-button-container");
+
+ if (urlbar && urlbar._fireEvent && !functionHooks.has(window))
{
- // Handle new URLs being entered
- let oldHandler = window.handleURLBarCommand;
- window.handleURLBarCommand = function()
+ function correctURL()
{
- try
+ let correction = corrector(window, urlbar.value);
+ if (correction)
+ urlbar.value = correction;
+ }
+
+ let unhook = hook(urlbar, "_fireEvent", function(eventType)
+ {
+ if (eventType == "textentered")
{
- let correction = corrector(window, urlbar.value);
- if (correction)
- urlbar.value = correction;
+ correctURL();
}
- catch(e)
- {
- if (e == Cr.NS_BINDING_ABORTED)
- return;
- else
- Cu.reportError(e);
- }
- oldHandler.apply(this, arguments);
+ });
+ functionHooks.set(window, unhook);
+
+ if (goButton)
+ {
+ goButton.addEventListener("command", correctURL, true);
+ eventListeners.set(window, {
+ "listener": correctURL,
+ "element": goButton
+ });
}
- window.handleURLBarCommand.urlfixerOldHandler = oldHandler;
- window.handleURLBarCommand.toString = doNotRecompile;
}
};
+ let basicRemove = exports.removeFromWindow;
exports.removeFromWindow = function(window)
{
- if (window.handleURLBarCommand && "urlfixerOldHandler" in window.handleURLBarCommand)
- window.handleURLBarCommand = window.handleURLBarCommand.urlfixerOldHandler;
+ basicRemove(window);
+
+ if (eventListeners.has(window))
+ {
+ let eventListener = eventListeners.get(window);
+ eventListener.element.removeEventListener("command", eventListener.listener, true);
Wladimir Palant 2012/09/28 09:35:19 Taking over comment from previous review: eventLi
+ }
};
-
+
exports.openInfobar = function(window, id, message, buttons, persistence)
{
let browser = exports.getBrowser(window);
let infobar = browser.getNotificationBox();
let notif = infobar.getNotificationWithValue(id);
-
+
if (notif)
{
infobar.removeNotification(notif);
}
-
+
notif = infobar.appendNotification(
message,
id,
@@ -153,10 +148,10 @@
);
notif.persistence = persistence;
};
-
- exports.loadURI = function(uri)
+
+ exports.loadURI = function(window, uri)
{
- exports.getBrowser(Services.wm.getMostRecentWindow("navigator:browser")).loadURI(uri);
+ exports.getBrowser(window).loadURI(uri);
};
break;
@@ -172,47 +167,52 @@
exports.applyToWindow = function(window, corrector)
{
- if ("BrowserUI" in window && window.BrowserUI.goToURI && !("urlfixerOldHandler" in window.BrowserUI.goToURI))
+ if ("BrowserUI" in window && window.BrowserUI.goToURI && !functionHooks.has(window))
{
// Handle new URLs being entered
- let oldHandler = window.BrowserUI.goToURI;
- window.BrowserUI.goToURI = function(url)
+ let unhook = hook(window.BrowserUI, "goToURI", function(url)
{
url = url || this._edit.value;
- try
- {
- let correction = corrector(window, url);
- if (correction)
- url = correction;
- }
- catch(e)
- {
- if (e == Cr.NS_BINDING_ABORTED)
- return;
- else
- Cu.reportError(e);
- }
- oldHandler.call(this, url);
- }
- window.BrowserUI.goToURI.urlfixerOldHandler = oldHandler;
- window.BrowserUI.goToURI.toString = doNotRecompile;
+
+ let correction = corrector(window, url);
+ if (correction)
+ url = correction;
+
+ return [url];
+ });
+ functionHooks.set(window, unhook);
}
};
- exports.removeFromWindow = function(window)
+ exports.openInfobar = function(window, id, message, buttons, persistence)
{
- if ("BrowserUI" in window && window.BrowserUI.goToURI && "urlfixerOldHandler" in window.BrowserUI.goToURI)
- window.BrowserUI.goToURI = window.BrowserUI.goToURI.urlfixerOldHandler;
+ if ("getNotificationBox" in window)
+ {
+ let infobar = window.getNotificationBox();
+ let notification = infobar.getNotificationWithValue(id);
+
+ if (notification)
+ {
+ infobar.removeNotification(notification);
+ }
+
+ notification = infobar.appendNotification(
+ message,
+ id,
+ require("info").addonRoot + "icon64.png",
+ infobar.PRIORITY_INFO_HIGH,
+ buttons
+ );
+ notification.persistence = persistence;
+ }
};
-
- exports.openInfobar = function()
- {
- // TODO: Implement infobar
- };
-
+
exports.loadURI = function(window, uri)
{
- // TODO: Implement infobar
+ if ("BrowserUI" in window && "goToURI" in window.BrowserUI)
+ {
+ window.BrowserUI.goToURI(uri);
+ }
};
break;
@@ -228,30 +228,18 @@
exports.applyToWindow = function(window, corrector)
{
- if ("BrowserApp" in window && window.BrowserApp.observe && !("urlfixerOldHandler" in window.BrowserApp.observe))
+ if ("BrowserApp" in window && window.BrowserApp.observe && !functionHooks.has(window))
{
- let oldHandler = window.BrowserApp.observe;
- let oldFunc = null;
- let handler = function()
+ let innerUnhook = null;
+ function cleanup()
{
- let params = Array.prototype.slice.apply(arguments);
- try
- {
- let correction = corrector(window, params[0]);
- if (correction)
- params[0] = correction;
- }
- catch(e)
- {
- if (e == Cr.NS_BINDING_ABORTED)
- return null;
- else
- Cu.reportError(e);
- }
- return oldFunc.apply(this, params);
- };
+ if (innerUnhook)
+ innerUnhook();
- window.BrowserApp.observe = function(subject, topic, data)
+ innerUnhook = null;
+ }
+
+ let unhook = hook(window.BrowserApp, "observe", function(subject, topic, data)
{
// Huge hack: we replace addTab/loadURI when the observer is
// triggered. This seems to be the only way to know that the calls
@@ -264,31 +252,20 @@
if (method)
{
- oldFunc = this[method];
- this[method] = handler;
+ innerUnhook = hook(this, method, function()
+ {
+ let params = Array.prototype.slice.apply(arguments);
+ let correction = corrector(window, params[0]);
+ if (correction)
+ params[0] = correction;
+ return params;
+ });
}
-
- try
- {
- oldHandler.apply(this, arguments);
- }
- finally
- {
- if (method)
- this[method] = oldFunc;
- }
- };
- window.BrowserApp.observe.urlfixerOldHandler = oldHandler;
- window.BrowserApp.observe.toString = doNotRecompile;
+ }, cleanup);
+ functionHooks.set(window, unhook);
}
};
- exports.removeFromWindow = function(window)
- {
- if ("BrowserApp" in window && window.BrowserApp.observe && "urlfixerOldHandler" in window.BrowserApp.observe)
- window.BrowserApp.observe = window.BrowserApp.observe.urlfixerOldHandler;
- };
-
exports.openInfobar = function(window, id, message, buttons, persistence)
{
if ("BrowserApp" in window && "selectedTab" in window.BrowserApp)
@@ -300,10 +277,9 @@
);
}
};
-
- exports.loadURI = function(uri)
+
+ exports.loadURI = function(window, uri)
{
- let window = Services.wm.getMostRecentWindow("navigator:browser");
if ("BrowserApp" in window && "loadURI" in window.BrowserApp)
window.BrowserApp.loadURI(uri);
};
« no previous file with comments | « chrome/content/tests/tests/suffixTreeManipulation.js ('k') | lib/hooks.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld