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

Bug 935784 - Avoid popping up the findbar when editing text fields in e10s (r=evilpie)

Browse Source
This commit is contained in:
Bill McCloskey 2013-11-19 13:20:15 -08:00
parent 6ba1c7bda1
commit 8097484a84
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
toolkit/content/browser-child.js
View File

@ -10,6 +10,22 @@ Cu.import("resource://gre/modules/Services.jsm");
Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import("resource://gre/modules/RemoteAddonsChild.jsm");
let SyncHandler = {
init: function() {
sendAsyncMessage("SetSyncHandler", {}, {handler: this});
},
getFocusedElementAndWindow: function() {
let fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
let focusedWindow = {};
let elt = fm.getFocusedElementForWindow(content, true, focusedWindow);
return [elt, focusedWindow.value];
},
};
SyncHandler.init();
let WebProgressListener = {
init: function() {
let webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
@ -33,10 +49,8 @@ let WebProgressListener = {
},
_setupObjects: function setupObjects(aWebProgress) {
let win = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow);
return {
contentWindow: win,
contentWindow: content,
// DOMWindow is not necessarily the content-window with subframes.
DOMWindow: aWebProgress.DOMWindow
};

9
toolkit/content/widgets/findbar.xml
View File

@ -679,11 +679,15 @@
return false;
let elt = document.commandDispatcher.focusedElement;
let win = document.commandDispatcher.focusedWindow;
// Temporary fix for e10s.
if (elt instanceof XULElement && elt.tagName == "xul:browser" &&
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
if (elt instanceof XULElement &&
elt.localName == "browser" &&
elt.namespaceURI == XUL_NS &&
elt.getAttribute("remote")) {
elt = elt.contentDocument.activeElement;
[elt, win] = elt.syncHandler.getFocusedElementAndWindow();
}
if (elt) {
@ -697,7 +701,6 @@
return false;
}
let win = document.commandDispatcher.focusedWindow;
if (win && !this._mimeTypeIsTextBased(win.document.contentType))
return false;

11
toolkit/content/widgets/remote-browser.xml
View File

@ -107,6 +107,12 @@
onget="return this.contentWindow ? this.contentWindow.document : null"
readonly="true"/>
<field name="_syncHandler">null</field>
<property name="syncHandler"
onget="return this._syncHandler"
readonly="true"/>
<field name="_imageDocument">null</field>
<property name="imageDocument"
@ -121,6 +127,7 @@
this.messageManager.addMessageListener("DOMTitleChanged", this);
this.messageManager.addMessageListener("ImageDocumentLoaded", this);
this.messageManager.addMessageListener("SetSyncHandler", this);
this.messageManager.loadFrameScript("chrome://global/content/browser-child.js", true);
if (this.hasAttribute("selectpopup")) {
@ -159,6 +166,10 @@
};
break;
case "SetSyncHandler":
this._syncHandler = aMessage.objects.handler;
break;
case "Forms:ShowDropDown": {
Cu.import("resource://gre/modules/SelectParentHelper.jsm");
let dropdown = document.getElementById(this.getAttribute("selectpopup"));