| Index: webrequest.js |
| =================================================================== |
| --- a/webrequest.js |
| +++ b/webrequest.js |
| @@ -17,6 +17,7 @@ |
| var FilterNotifier = require("filterNotifier").FilterNotifier; |
| var platform = require("info").platform; |
| +var logRequest = require("devtools").logRequest; |
| var onFilterChangeTimeout = null; |
| function onFilterChange() |
| @@ -52,11 +53,12 @@ |
| if (isFrameWhitelisted(page, frame)) |
| return true; |
| + var reqType = type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(); |
| var docDomain = extractHostFromFrame(frame); |
| var key = getKey(page, frame); |
| var filter = defaultMatcher.matchesAny( |
| stringifyURL(url), |
| - type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(), |
| + reqType, |
| docDomain, |
| isThirdParty(url, docDomain), |
| key |
| @@ -71,7 +73,9 @@ |
| showNotification(notificationToShow); |
| } |
| + logRequest(page, url, reqType, docDomain, key, filter); |
| FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page); |
| + |
| return !(filter instanceof BlockingFilter); |
| } |