Topic 11477 - Whitelisting doesn`t deal with frames correctly

When checking whether a frame is whitelisted we are currently always assuming that it is the top-level frame. We need to get the URL of the parent frame and consider it.

[Felix Dahlke, 2012-11-06 10:20:59]

http://codereview.adblockplus.org/8792018/diff/1/webrequest.js
File webrequest.js (right):

http://codereview.adblockplus.org/8792018/diff/1/webrequest.js#newcode184
webrequest.js:184: var parentData = getFrameData(tabId, parent);
Can the supplied frameId be -1? The previous version handled this case.

http://codereview.adblockplus.org/8792018/diff/1/webrequest.js#newcode194
webrequest.js:194: var parentUrl = (parentData ? parentData.url : frameUrl);
Shouldn't parentUrl be null if there is no parent? isWhitelisted() can handle a
null parentUrl.

[Wladimir Palant, 2012-11-06 11:02:02]

http://codereview.adblockplus.org/8792018/diff/1/webrequest.js
File webrequest.js (right):

http://codereview.adblockplus.org/8792018/diff/1/webrequest.js#newcode184
webrequest.js:184: var parentData = getFrameData(tabId, parent);
On 2012/11/06 10:20:59, Felix H. Dahlke wrote:
> Can the supplied frameId be -1? The previous version handled this case.

Yes, it could be -1. getFrameData() will return null then and the function will
immediately return false.

http://codereview.adblockplus.org/8792018/diff/1/webrequest.js#newcode194
webrequest.js:194: var parentUrl = (parentData ? parentData.url : frameUrl);
On 2012/11/06 10:20:59, Felix H. Dahlke wrote:
> Shouldn't parentUrl be null if there is no parent? isWhitelisted() can handle
a
> null parentUrl. 

I considered this but decided that it would be better to define all parameters
explicitly rather than rely on implicit behavior of isWhitelisted(). In the top
frame we are our own parent.

[Felix Dahlke, 2012-11-06 11:05:07]

OK, LGTM.

[Felix Dahlke, 2012-11-06 11:07:05]

LGTM