Rework on Bug 911169 from a clean base

Hi,

I have reworked the solution for Bug 911169 with one commit, and updated everything raised during the last review. There is one new thing, I added 'img-src' checker into isActiveContent().

Please have a review.

Thank you
David