Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review related to the early blocking of network requests at launch

This commit is contained in:
Raymond Hill 2018-12-24 08:56:35 -05:00
parent fe595bb2b9
commit be9e7fd11c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/firefox/vapi-webrequest.js
View File

@ -170,8 +170,8 @@ vAPI.net.onBeforeReady = (function() {
stop: function(resolver) { stop: function(resolver) {
if ( pendings === undefined ) { return; } if ( pendings === undefined ) { return; }
for ( const pending of pendings ) { for ( const pending of pendings ) {
const result = resolver(pending.details); vAPI.net.normalizeDetails(pending.details);
pending.resolve(result); pending.resolve(resolver(pending.details));
} }
pendings = undefined; pendings = undefined;
}, },

4
src/js/filtering-context.js
View File

@ -46,13 +46,11 @@
µBlock.FilteringContext.prototype = { µBlock.FilteringContext.prototype = {
fromTabId: function(tabId) { fromTabId: function(tabId) {
if ( tabId !== -1 || tabId !== this.tabId ) {
const tabContext = µBlock.tabContextManager.mustLookup(tabId); const tabContext = µBlock.tabContextManager.mustLookup(tabId);
this.tabOrigin = tabContext.origin; this.tabOrigin = tabContext.origin;
this.tabHostname = tabContext.rootHostname; this.tabHostname = tabContext.rootHostname;
this.tabDomain = tabContext.rootDomain; this.tabDomain = tabContext.rootDomain;
this.tabId = tabId; this.tabId = tabContext.tabId;
}
return this; return this;
}, },
fromWebrequestDetails: function(details) { fromWebrequestDetails: function(details) {