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

Bug 666804 - [e10s] Support NetworkPrioritizer (r=felipe)

Browse Source
This commit is contained in:
Bill McCloskey 2014-03-11 20:13:48 -07:00
parent 0245244bfd
commit 96f886f1cf
5 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/base/content/browser.js
View File

@ -1093,12 +1093,9 @@ var gBrowserInit = {
if (!getBoolPref("ui.click_hold_context_menus", false))
SetClickAndHoldHandlers();
// Bug 666804 - NetworkPrioritizer support for e10s
if (!gMultiProcessBrowser) {
let NP = {};
Cu.import("resource:///modules/NetworkPrioritizer.jsm", NP);
NP.trackBrowserWindow(window);
}
let NP = {};
Cu.import("resource:///modules/NetworkPrioritizer.jsm", NP);
NP.trackBrowserWindow(window);
PlacesToolbarHelper.init();

10
browser/modules/NetworkPrioritizer.jsm
View File

@ -80,18 +80,12 @@ let BrowserHelper = {
windowEntry.lastSelectedBrowser = aBrowser;
},
// Auxiliary methods
getLoadgroup: function NP_BH_getLoadgroup(aBrowser) {
return aBrowser.webNavigation.QueryInterface(Ci.nsIDocumentLoader)
.loadGroup.QueryInterface(Ci.nsISupportsPriority);
},
increasePriority: function NP_BH_increasePriority(aBrowser) {
this.getLoadgroup(aBrowser).adjustPriority(PRIORITY_DELTA);
aBrowser.adjustPriority(PRIORITY_DELTA);
},
decreasePriority: function NP_BH_decreasePriority(aBrowser) {
this.getLoadgroup(aBrowser).adjustPriority(PRIORITY_DELTA * -1);
aBrowser.adjustPriority(PRIORITY_DELTA * -1);
}
};

7
toolkit/content/browser-child.js
View File

@ -286,6 +286,13 @@ addMessageListener("History:UseGlobalHistory", function (aMessage) {
docShell.useGlobalHistory = aMessage.data.enabled;
});
addMessageListener("NetworkPrioritizer:AdjustPriority", (msg) => {
let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
let loadGroup = webNav.QueryInterface(Ci.nsIDocumentLoader)
.loadGroup.QueryInterface(Ci.nsISupportsPriority);
loadGroup.adjustPriority(msg.data.adjustment);
});
let AutoCompletePopup = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompletePopup]),

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

@ -674,6 +674,15 @@
</setter>
</property>
<method name="adjustPriority">
<parameter name="adjustment"/>
<body><![CDATA[
let loadGroup = this.webNavigation.QueryInterface(Ci.nsIDocumentLoader)
.loadGroup.QueryInterface(Ci.nsISupportsPriority);
loadGroup.adjustPriority(adjustment);
]]></body>
</method>
<!--
This field tracks the location bar state. The value that the user typed
in to the location bar may not be changed while this field is zero.

8
toolkit/content/widgets/remote-browser.xml
View File

@ -31,6 +31,14 @@
]]></getter>
</property>
<method name="adjustPriority">
<parameter name="adjustment"/>
<body><![CDATA[
this.messageManager.sendAsyncMessage("NetworkPrioritizer:AdjustPriority",
{adjustment: adjustment});
]]></body>
</method>
<field name="_remoteWebNavigation">null</field>
<property name="webNavigation"