wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 86d8067fa9e5 (bug 802366) on a CLOSED TREE

Browse Source
This commit is contained in:
Justin Lebar 2012-10-30 21:36:32 -04:00
parent c867b89b40
commit 6f958d371d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/components/MozKeyboard.js
View File

@ -36,7 +36,7 @@ MozKeyboard.prototype = {
init: function mozKeyboardInit(win) {
Services.obs.addObserver(this, "inner-window-destroyed", false);
Services.obs.addObserver(this, 'in-process-browser-or-app-frame-shown', false);
Services.obs.addObserver(this, 'in-process-browser-frame-shown', false);
Services.obs.addObserver(this, 'remote-browser-frame-shown', false);
this._window = win;
@ -116,7 +116,7 @@ MozKeyboard.prototype = {
break;
}
case 'remote-browser-frame-shown':
case 'in-process-browser-or-app-frame-shown': {
case 'in-process-browser-frame-shown': {
let frameLoader = subject.QueryInterface(Ci.nsIFrameLoader);
let mm = frameLoader.messageManager;
mm.addMessageListener("Forms:Input", (function receiveMessage(msg) {

2
content/base/src/nsFrameLoader.cpp
View File

@ -1620,7 +1620,7 @@ nsFrameLoader::MaybeCreateDocShell()
nsCOMPtr<nsIObserverService> os = services::GetObserverService();
if (os) {
os->NotifyObservers(NS_ISUPPORTS_CAST(nsIFrameLoader*, this),
"in-process-browser-or-app-frame-shown", NULL);
"in-process-browser-frame-shown", NULL);
}
if (mMessageManager) {

4
dom/browser-element/BrowserElementParent.js
View File

@ -120,7 +120,7 @@ BrowserElementParentFactory.prototype = {
var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
os.addObserver(this, 'remote-browser-frame-shown', /* ownsWeak = */ true);
os.addObserver(this, 'in-process-browser-or-app-frame-shown', /* ownsWeak = */ true);
os.addObserver(this, 'in-process-browser-frame-shown', /* ownsWeak = */ true);
},
_browserFramesPrefEnabled: function() {
@ -161,7 +161,7 @@ BrowserElementParentFactory.prototype = {
case 'remote-browser-frame-shown':
this._observeRemoteBrowserFrameShown(subject);
break;
case 'in-process-browser-or-app-frame-shown':
case 'in-process-browser-frame-shown':
this._observeInProcessBrowserFrameShown(subject);
break;
case 'content-document-global-created':