Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1109875 - Fix test failures by making <xul:iframe> and <xul:editor> elements query the frameLoader for the docShell instead of the boxObject r=smaug

Browse Source
This commit is contained in:
Tim Taubert 2015-05-05 16:33:14 +02:00
parent d7a0af2f06
commit f1b967520b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,9 +134,12 @@
readonly="true"/>
<property name="contentDocument" readonly="true"
onget="return this.webNavigation.document;"/>
<property name="docShell"
onget="return this.boxObject.docShell;"
readonly="true"/>
<property name="docShell" readonly="true">
<getter><![CDATA[
let frameLoader = this.QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader;
return frameLoader ? frameLoader.docShell : null;
]]></getter>
</property>
<property name="currentURI"
readonly="true"
onget="return this.webNavigation.currentURI;"/>

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

@ -85,9 +85,12 @@
<binding id="iframe" role="outerdoc">
<implementation>
<property name="docShell"
readonly="true"
onget="return this.boxObject.docShell"/>
<property name="docShell" readonly="true">
<getter><![CDATA[
let frameLoader = this.QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader;
return frameLoader ? frameLoader.docShell : null;
]]></getter>
</property>
<property name="contentWindow"
readonly="true"
onget="return this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);"/>