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

Context of `about:blank` is that of parent frame (`popup` option) 

Related feedback:
- https://github.com/uBlockOrigin/uBlock-issues/discussions/2534#discussioncomment-5264792
This commit is contained in:
Raymond Hill 2023-03-10 08:48:48 -05:00
parent 3c4c3767a2
commit 574f30ed43
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/js/tab.js
View File

@ -316,9 +316,24 @@ const onPopupUpdated = (( ) => {
if ( tabContext === null ) { return; }
const rootOpenerURL = tabContext.rawURL;
if ( rootOpenerURL === '' ) { return; }
const localOpenerURL = openerDetails.frameId !== 0
const pageStore = µb.pageStoreFromTabId(openerTabId);
// https://github.com/uBlockOrigin/uBlock-issues/discussions/2534#discussioncomment-5264792
// An `about:blank` frame's context is that of the parent context
let localOpenerURL = openerDetails.frameId !== 0
? openerDetails.frameURL
: undefined;
if ( localOpenerURL === 'about:blank' && pageStore !== null ) {
let openerFrameId = openerDetails.frameId;
do {
const frame = pageStore.getFrameStore(openerFrameId);
if ( frame === null ) { break; }
openerFrameId = frame.parentId;
const parentFrame = pageStore.getFrameStore(openerFrameId);
if ( parentFrame === null ) { break; }
localOpenerURL = parentFrame.frameURL;
} while ( localOpenerURL === 'about:blank' && openerFrameId !== 0 );
}
// Popup details.
tabContext = µb.tabContextManager.lookup(targetTabId);
@ -392,7 +407,6 @@ const onPopupUpdated = (( ) => {
// Only if a popup was blocked do we report it in the dynamic
// filtering pane.
const pageStore = µb.pageStoreFromTabId(openerTabId);
if ( pageStore ) {
pageStore.journalAddRequest(fctxt, result);
pageStore.popupBlockedCount += 1;