Cosmetic filtering fixes #12038
Cosmetic filtering fixes #12038
Conversation
github-actions
bot
added
the
CI/storybook-url
| }; | ||
| })();)"; | ||
|
|
||
| const char kStyleSelectorsInjectScript[] = |
There was a problem hiding this comment.
I've removed kForceHideSelectorsInjectScript and kStyleSelectorsInjectScript entirely. They were previously adding rules to window.content_cosmetic.cosmeticStyleSheet in order to keep track of the indices of rules, but this is no longer necessary as a result of using injectStylesheet with an id of 0. At that point, there is no special behavior in JS and we can construct the corresponding stylesheets directly in C++ instead.
| web_frame->GetDocument().InsertStyleSheet( | ||
| blink::WebString::FromUTF8(stylesheet), style_sheet_key, | ||
| blink::WebDocument::kUserOrigin); |
There was a problem hiding this comment.
InsertStyleSheet with kUserOrigin provides the desired "injected stylesheet" behavior as if it were added by an extension, rather than "constructed stylesheet" from document.adoptedStyleSheets.
It also has the added bonus of being able to pass in a custom blink::WebString as an identifier for each stylesheet, allowing those sheets to be removed later by RemoveInsertedStyleSheet. There was previously a lot of JS code to manage this around the document.adoptedStyleSheets API.
InsertStyleSheet and RemoveInsertedStyleSheet are exposed directly to the JS cosmetic filtering script through injectStylesheet and uninjectStylesheet.
| R"(addElementsDynamically(); | ||
| async function waitCSSSelector() { |
There was a problem hiding this comment.
|
A Storybook has been deployed to preview UI for the latest push |
| json_selectors = "[]"; | ||
| base::Value* force_hide_selectors_list = | ||
| resources_dict->FindListKey("force_hide_selectors"); | ||
| if (force_hide_selectors_list->GetList().size() != 0) { |
There was a problem hiding this comment.
perhaps worth to check force_hide_selectors_list != nullptr in case we don't have that key.
There was a problem hiding this comment.
oops, good catch! I thought I had it but I guess not
antonok-edm
force-pushed
the
cosmetic-filtering-fixes
branch
from
641229c
to
e109cb7
Compare
| if (force_hide_selectors_list && | ||
| base::Value* force_hide_selectors_list = | ||
| resources_dict->FindListKey("force_hide_selectors"); | ||
| if (force_hide_selectors && |
There was a problem hiding this comment.
force_hide_selectors_list?
There was a problem hiding this comment.
🤦 yep...
updated
antonok-edm
force-pushed
the
cosmetic-filtering-fixes
branch
from
e109cb7
to
6185388
Compare
|
A Storybook has been deployed to preview UI for the latest push |
Resolves brave/brave-browser#20177
Resolves brave/brave-browser#20722
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_tests,npm run lint,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan:
See brave/brave-browser#20177 (comment)