From c5953171fa69252916054963cddb6bd6f1a5368d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Sat, 20 Jul 2013 09:47:47 -0700 Subject: [PATCH] Bug 883002 - Add opensearch support to the mozbrowser API r=jlebar --- .../BrowserElementChildPreload.js | 53 ++++++--- dom/browser-element/BrowserElementParent.jsm | 1 + dom/browser-element/mochitest/Makefile.in | 3 + .../mochitest/browserElement_Opensearch.js | 109 ++++++++++++++++++ ...test_browserElement_inproc_Opensearch.html | 19 +++ .../test_browserElement_oop_Opensearch.html | 19 +++ 6 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 dom/browser-element/mochitest/browserElement_Opensearch.js create mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_Opensearch.html create mode 100644 dom/browser-element/mochitest/test_browserElement_oop_Opensearch.html diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js index c2c395246ca6..e4404b4c0845 100644 --- a/dom/browser-element/BrowserElementChildPreload.js +++ b/dom/browser-element/BrowserElementChildPreload.js @@ -171,7 +171,7 @@ BrowserElementChild.prototype = { /* wantsUntrusted = */ false); addEventListener('DOMLinkAdded', - this._iconChangedHandler.bind(this), + this._linkAddedHandler.bind(this), /* useCapture = */ true, /* wantsUntrusted = */ false); @@ -447,22 +447,45 @@ BrowserElementChild.prototype = { }, _iconChangedHandler: function(e) { - debug("Got iconchanged: (" + e.target.href + ")"); - var hasIcon = e.target.rel.split(' ').some(function(x) { - return x.toLowerCase() === 'icon'; - }); + debug('Got iconchanged: (' + e.target.href + ')'); - if (hasIcon) { - var win = e.target.ownerDocument.defaultView; - // Ignore iconchanges which don't come from the top-level - //