Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: webrequest.js

Issue 5666188336037888: Issue 581 - Fixed element hiding/collapsing in anonymous frames on Chrome (Closed)
Patch Set: Rely on frame's src attribute again Created June 3, 2014, 8:34 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« include.preload.js ('K') | « lib/basedomain.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 window.clearTimeout(onFilterChangeTimeout); 45 window.clearTimeout(onFilterChangeTimeout);
46 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000); 46 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000);
47 } 47 }
48 }); 48 });
49 49
50 function onBeforeRequest(url, type, page, frame) 50 function onBeforeRequest(url, type, page, frame)
51 { 51 {
52 if (isFrameWhitelisted(page, frame)) 52 if (isFrameWhitelisted(page, frame))
53 return true; 53 return true;
54 54
55 var docDomain = extractHostFromURL(frame.url); 55 var docDomain = extractHostFromFrame(frame);
56 var filter = defaultMatcher.matchesAny( 56 var filter = defaultMatcher.matchesAny(
57 url, 57 url,
58 type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(), 58 type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
59 docDomain, 59 docDomain,
60 isThirdParty(extractHostFromURL(url), docDomain) 60 isThirdParty(extractHostFromURL(url), docDomain)
61 ); 61 );
62 62
63 // We can't listen to onHeadersReceived in Safari so we need to 63 // We can't listen to onHeadersReceived in Safari so we need to
64 // check for notifications here 64 // check for notifications here
65 if (platform != "chromium" && type == "sub_frame") 65 if (platform != "chromium" && type == "sub_frame")
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 processKeyException(header.value, page, frame); 98 processKeyException(header.value, page, frame);
99 } 99 }
100 100
101 var notificationToShow = Notification.getNextToShow(details.url); 101 var notificationToShow = Notification.getNextToShow(details.url);
102 if (notificationToShow) 102 if (notificationToShow)
103 showNotification(notificationToShow); 103 showNotification(notificationToShow);
104 } 104 }
105 105
106 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<a ll_urls>"]}, ["responseHeaders"]); 106 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<a ll_urls>"]}, ["responseHeaders"]);
107 } 107 }
OLDNEW
« include.preload.js ('K') | « lib/basedomain.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld