Bug 1019762 - Wallpaper over "TypeError: this.docShell is null" Promise rejections. r=felipc

CLOSED TREE
This commit is contained in:
David Rajchenbach-Teller 2014-06-03 10:34:00 -04:00
parent 47d2f9cd2b
commit c9b7461fe3

View File

@ -202,9 +202,15 @@
</body>
</method>
<property name="currentURI"
onget="return this.webNavigation.currentURI;"
readonly="true"/>
<property name="currentURI" readonly="true">
<getter><![CDATA[
if (this.webNavigation) {
return this.webNavigation.currentURI;
}
return null;
]]>
</getter>
</property>
<!--
Used by session restore to ensure that currentURI is set so
@ -316,8 +322,12 @@
readonly="true">
<getter>
<![CDATA[
if (!this._webNavigation)
this._webNavigation = this.docShell.QueryInterface(Components.interfaces.nsIWebNavigation);
if (!this._webNavigation) {
if (!this.docShell) {
return null;
}
this._webNavigation = this.docShell.QueryInterface(Ci.nsIWebNavigation);
}
return this._webNavigation;
]]>
</getter>