зеркало из https://github.com/mozilla/gecko-dev.git
fix for 51053, where we'd throw too early when trying to close popups. added try/catch around each individual QI. r=ben/sr=scc.
This commit is contained in:
Родитель
c1d77f34a4
Коммит
5947c4f6ed
|
@ -473,6 +473,8 @@
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
try {
|
try {
|
||||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||||
|
} catch(e) {}
|
||||||
|
try {
|
||||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
if (popupSetBox)
|
if (popupSetBox)
|
||||||
|
@ -487,6 +489,8 @@
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
try {
|
try {
|
||||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||||
|
} catch(e) {}
|
||||||
|
try {
|
||||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
if (popupSetBox)
|
if (popupSetBox)
|
||||||
|
@ -501,6 +505,8 @@
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
try {
|
try {
|
||||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||||
|
} catch(e) {}
|
||||||
|
try {
|
||||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
if (popupSetBox)
|
if (popupSetBox)
|
||||||
|
@ -514,6 +520,8 @@
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
try {
|
try {
|
||||||
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
var popupSetBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIPopupSetBoxObject);
|
||||||
|
} catch(e) {}
|
||||||
|
try {
|
||||||
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
var menuBox = this.parentNode.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
if (popupSetBox)
|
if (popupSetBox)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче