From 3302c026c56261c6aa13f4001d1e8f18c4d7d651 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 23 May 2012 10:16:32 +0100 Subject: [PATCH] Backout baee7c540118 (bug 757486) for M3 orange --- dom/base/BrowserElementChild.js | 38 +------- dom/base/BrowserElementParent.js | 13 --- dom/tests/mochitest/browser-frame/Makefile.in | 2 - .../browser-frame/browserFrameHelpers.js | 3 - .../mochitest/browser-frame/file_focus.html | 26 ----- .../test_browserFrame_keyEvents.html | 97 ------------------- 6 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 dom/tests/mochitest/browser-frame/file_focus.html delete mode 100644 dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html diff --git a/dom/base/BrowserElementChild.js b/dom/base/BrowserElementChild.js index fcff9b5a276..8f6bcf742d7 100644 --- a/dom/base/BrowserElementChild.js +++ b/dom/base/BrowserElementChild.js @@ -9,15 +9,6 @@ let Ci = Components.interfaces; let Cc = Components.classes; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -// Event whitelisted for bubbling. -let whitelistedEvents = [ - Ci.nsIDOMKeyEvent.DOM_VK_ESCAPE, // Back button. - Ci.nsIDOMKeyEvent.DOM_VK_CONTEXT_MENU, - Ci.nsIDOMKeyEvent.DOM_VK_F5, // Search button. - Ci.nsIDOMKeyEvent.DOM_VK_PAGE_UP, // Volume up. - Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN // Volume down. -]; - function debug(msg) { //dump("BrowserElementChild - " + msg + "\n"); } @@ -41,8 +32,6 @@ function sendSyncMsg(msg, data) { * the parent process. */ -var global = this; - function BrowserElementChild() { this._init(); }; @@ -68,7 +57,7 @@ BrowserElementChild.prototype = { // Get the app manifest from the parent, if our frame has one. let appManifestURL = sendSyncMsg('get-mozapp-manifest-url')[0]; let windowUtils = content.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils); + .getInterface(Components.interfaces.nsIDOMWindowUtils); if (!!appManifestURL) { windowUtils.setIsApp(true); @@ -89,21 +78,6 @@ BrowserElementChild.prototype = { addMessageListener("browser-element-api:get-screenshot", this._recvGetScreenshot.bind(this)); - - let els = Cc["@mozilla.org/eventlistenerservice;1"] - .getService(Ci.nsIEventListenerService); - - // We are using the system group for those events so if something in the - // content called .stopPropagation() this will still be called. - els.addSystemEventListener(global, 'keydown', - this._keyEventHandler.bind(this), - /* useCapture = */ true); - els.addSystemEventListener(global, 'keypress', - this._keyEventHandler.bind(this), - /* useCapture = */ true); - els.addSystemEventListener(global, 'keyup', - this._keyEventHandler.bind(this), - /* useCapture = */ true); }, _titleChangedHandler: function(e) { @@ -155,16 +129,6 @@ BrowserElementChild.prototype = { }); }, - _keyEventHandler: function(e) { - if (whitelistedEvents.indexOf(e.keyCode) != -1 && !e.defaultPrevented) { - sendAsyncMsg('keyevent', { - type: e.type, - code: e.keyCode, - charCode: e.charCode, - }); - } - }, - // The docShell keeps a weak reference to the progress listener, so we need // to keep a strong ref to it ourselves. _progressListener: { diff --git a/dom/base/BrowserElementParent.js b/dom/base/BrowserElementParent.js index 9c0a03f61e3..4cde5d26f43 100644 --- a/dom/base/BrowserElementParent.js +++ b/dom/base/BrowserElementParent.js @@ -106,7 +106,6 @@ BrowserElementParent.prototype = { addMessageListener("titlechange", this._fireEventFromMsg); addMessageListener("iconchange", this._fireEventFromMsg); addMessageListener("get-mozapp-manifest-url", this._sendMozAppManifestURL); - addMessageListener("keyevent", this._fireKeyEvent); mm.addMessageListener('browser-element-api:got-screenshot', this._recvGotScreenshot.bind(this)); @@ -165,18 +164,6 @@ BrowserElementParent.prototype = { return req; }, - _fireKeyEvent: function(frameElement, data) { - let win = frameElement.ownerDocument.defaultView; - let evt = frameElement.ownerDocument.createEvent("KeyboardEvent"); - - evt.initKeyEvent(data.json.type, true, true, win, - false, false, false, false, // modifiers - data.json.keyCode, - data.json.charCode); - - frameElement.dispatchEvent(evt); - }, - observe: function(subject, topic, data) { switch(topic) { case 'app-startup': diff --git a/dom/tests/mochitest/browser-frame/Makefile.in b/dom/tests/mochitest/browser-frame/Makefile.in index 0544969c275..92e8c6dc1fb 100644 --- a/dom/tests/mochitest/browser-frame/Makefile.in +++ b/dom/tests/mochitest/browser-frame/Makefile.in @@ -14,7 +14,6 @@ include $(topsrcdir)/config/rules.mk _TEST_FILES = \ file_empty.html \ - file_focus.html \ browserFrameHelpers.js \ test_browserFrame1.html \ test_browserFrame2.html \ @@ -25,7 +24,6 @@ _TEST_FILES = \ test_browserFrame7.html \ test_browserFrame8.html \ test_browserFrame9.html \ - test_browserFrame_keyEvents.html \ $(NULL) libs:: $(_TEST_FILES) diff --git a/dom/tests/mochitest/browser-frame/browserFrameHelpers.js b/dom/tests/mochitest/browser-frame/browserFrameHelpers.js index f75478783c7..6d834cd2724 100644 --- a/dom/tests/mochitest/browser-frame/browserFrameHelpers.js +++ b/dom/tests/mochitest/browser-frame/browserFrameHelpers.js @@ -106,9 +106,6 @@ const browserFrameHelpers = { 'emptyPage2': 'http://example.org' + window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/')) + '/file_empty.html', - 'focusPage': 'http://example.org' + - window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/')) + - '/file_focus.html', }; browserFrameHelpers.origEnabledPref = browserFrameHelpers.getEnabledPref(); diff --git a/dom/tests/mochitest/browser-frame/file_focus.html b/dom/tests/mochitest/browser-frame/file_focus.html deleted file mode 100644 index a33fc560d1f..00000000000 --- a/dom/tests/mochitest/browser-frame/file_focus.html +++ /dev/null @@ -1,26 +0,0 @@ - - - -Aloha! My URL is . - - - - - - - diff --git a/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html b/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html deleted file mode 100644 index 82eb256ce3d..00000000000 --- a/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - Test for Bug 757486 - - - - - - -Mozilla Bug 757486 - - - - - - -