Bug 1221644 - Support non-remote html:iframe as tabs in TabActor. r=jryans

This commit is contained in:
Alexandre Poirot 2015-11-16 07:22:48 -08:00
Родитель a6f436ac7c
Коммит 561a956866
1 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -345,8 +345,7 @@ BrowserTabList.prototype._getActorForBrowser = function(browser) {
this._checkListening();
return actor.connect();
} else {
actor = new BrowserTabActor(this._connection, browser,
browser.getTabBrowser());
actor = new BrowserTabActor(this._connection, browser);
this._actorByBrowser.set(browser, actor);
this._checkListening();
return promise.resolve(actor);
@ -1847,20 +1846,21 @@ exports.TabActor = TabActor;
/**
* Creates a tab actor for handling requests to a single in-process
* <browser> tab. Most of the implementation comes from TabActor.
* <xul:browser> tab, or <html:iframe>.
* Most of the implementation comes from TabActor.
*
* @param aConnection DebuggerServerConnection
* The connection to the client.
* @param aBrowser browser
* The browser instance that contains this tab.
* @param aTabBrowser tabbrowser
* The tabbrowser that can receive nsIWebProgressListener events.
* The frame instance that contains this tab.
*/
function BrowserTabActor(aConnection, aBrowser, aTabBrowser)
function BrowserTabActor(aConnection, aBrowser)
{
TabActor.call(this, aConnection, aBrowser);
this._browser = aBrowser;
this._tabbrowser = aTabBrowser;
if (typeof(aBrowser.getTabBrowser) == "function") {
this._tabbrowser = aBrowser.getTabBrowser();
}
Object.defineProperty(this, "docShell", {
value: this._browser.docShell,