Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1423229 - [1.1] Enable nsIClassifiedChannel interface in onSecurityChange callbacks. r=mconley

Browse Source
This commit is contained in:
Eugen Sawin 2018-01-23 22:20:58 +01:00
parent 796f266cda
commit 1f928adad2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,9 @@ var WebProgressListener = {
let json = this._setupJSON(aWebProgress, aRequest);
let objects = this._setupObjects(aWebProgress, aRequest);
let classChannel = aRequest.QueryInterface(Ci.nsIClassifiedChannel);
json.matchedList = classChannel.matchedList;
json.state = aState;
json.status = SecurityUI.getSSLStatusAsString();

9
toolkit/modules/RemoteWebProgress.jsm
View File

@ -12,19 +12,21 @@ const Cu = Components.utils;
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/Services.jsm");
function RemoteWebProgressRequest(spec, originalSpec, requestCPOW) {
function RemoteWebProgressRequest(spec, originalSpec, matchedList, requestCPOW) {
this.wrappedJSObject = this;
this._uri = Services.io.newURI(spec);
this._originalURI = Services.io.newURI(originalSpec);
this._requestCPOW = requestCPOW;
this._matchedList = matchedList;
}
RemoteWebProgressRequest.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel]),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel, Ci.nsIClassifiedChannel]),
get URI() { return this._uri.clone(); },
get originalURI() { return this._originalURI.clone(); }
get originalURI() { return this._originalURI.clone(); },
get matchedList() { return this._matchedList; }
};
function RemoteWebProgress(aManager, aIsTopLevel) {
@ -213,6 +215,7 @@ RemoteWebProgressManager.prototype = {
if (json.requestURI) {
request = new RemoteWebProgressRequest(json.requestURI,
json.originalRequestURI,
json.matchedList,
objects.request);
}