Bug 1394580 - 6. Use WindowEventDispatcher for prompt if available; r=me draft
authorJim Chen <nchen@mozilla.com>
Tue, 05 Sep 2017 21:26:32 -0400
changeset 659408 222c91f787e6d3578f9c1121bad2ec442835b3df
parent 659407 3593910c4add9d99009b76f724ee6c6f5da94a66
child 729987 13fa70cf41f4b15332644f8ea6ddcc6302ff8fb1
push id78126
push userbmo:nchen@mozilla.com
push dateWed, 06 Sep 2017 01:26:43 +0000
reviewersme
bugs1394580
milestone57.0a1
Bug 1394580 - 6. Use WindowEventDispatcher for prompt if available; r=me MozReview-Commit-ID: 3vRXlb4HWYq
mobile/android/components/geckoview/GeckoViewPrompt.js
--- 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]),