mozilla-central: changeset 379096:be2d4180503168ed1ec5b657b312ca37bfbc2efb

author	Jim Chen <nchen@mozilla.com>
	Tue, 05 Sep 2017 21:26:32 -0400
changeset 379096	be2d4180503168ed1ec5b657b312ca37bfbc2efb
parent 379095	b3b76444d58d39739c4b41ebe236023b57c55449
child 379097	1576df4c449ce07ba05a1aa0b0dc9eb4ca35fea7
push id	32448
push user	archaeopteryx@coole-files.de
push date	Wed, 06 Sep 2017 09:24:33 +0000
treeherder	mozilla-central@c6e59f1b2e27 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jchen
bugs	1394580
milestone	57.0a1
first release with	nightly linux32 93dd2e456c0e / 57.0a1 / 20170906220306 / files nightly linux64 c959327c6b75 / 57.0a1 / 20170906100107 / files nightly mac c959327c6b75 / 57.0a1 / 20170906100107 / files nightly win32 c959327c6b75 / 57.0a1 / 20170906100107 / files nightly win64 c959327c6b75 / 57.0a1 / 20170906100107 / files
last release without	nightly linux32 f64e2b4dcf5e / 57.0a1 / 20170905220108 / files nightly linux64 f64e2b4dcf5e / 57.0a1 / 20170905220108 / files nightly mac f64e2b4dcf5e / 57.0a1 / 20170905220108 / files nightly win32 f64e2b4dcf5e / 57.0a1 / 20170905220108 / files nightly win64 f64e2b4dcf5e / 57.0a1 / 20170905220108 / files

--- a/mobile/android/components/geckoview/GeckoViewPrompt.js
+++ b/mobile/android/components/geckoview/GeckoViewPrompt.js
@@ -364,17 +364,17 @@ function PromptDelegate(aDomWin) {
   if (!aDomWin) {
     return;
   }
   let gvWin = aDomWin.QueryInterface(Ci.nsIInterfaceRequestor)
                      .getInterface(Ci.nsIDocShell).QueryInterface(Ci.nsIDocShellTreeItem)
                      .rootTreeItem.QueryInterface(Ci.nsIInterfaceRequestor)
                      .getInterface(Ci.nsIDOMWindow);
   try {
-    this._dispatcher = EventDispatcher.for(gvWin);
+    this._dispatcher = gvWin.WindowEventDispatcher || EventDispatcher.for(gvWin);
   } catch (e) {
     // Use global dispatcher.
   }
 }
 
 PromptDelegate.prototype = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt]),