Skip to content

Commit

Permalink
WebExtensionContext::loadDeclarativeNetRequestRules takes 1.54s on th…
Browse files Browse the repository at this point in the history 
…e main thread loading Ghostery

https://webkit.org/b/270327
rdar://123867301

Reviewed by Timothy Hatcher.

Compile DNR rulesets on a background thread to prevent hang.

* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::compileDeclarativeNetRequestRules):

Canonical link: https://commits.webkit.org/275952@main
  • Loading branch information
@xeenon
Rob Hudson authored and xeenon committed Mar 12, 2024
1 parent b2b0e19 commit cedd7cb
Showing 1 changed file with 39 additions and 33 deletions.
72 changes: 39 additions & 33 deletions Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4061,48 +4061,54 @@ void effectiveAppearanceDidChange(Inspector::ExtensionAppearance appearance) ove

void WebExtensionContext::compileDeclarativeNetRequestRules(NSArray *rulesData, CompletionHandler<void(bool)>&& completionHandler)
{
NSArray<NSString *> *jsonDeserializationErrorStrings;
auto *allJSONObjects = [_WKWebExtensionDeclarativeNetRequestTranslator jsonObjectsFromData:rulesData errorStrings:&jsonDeserializationErrorStrings];
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), makeBlockPtr([this, protectedThis = Ref { *this }, rulesData = RetainPtr { rulesData }, completionHandler = WTFMove(completionHandler)]() mutable {
NSArray<NSString *> *jsonDeserializationErrorStrings;
auto *allJSONObjects = [_WKWebExtensionDeclarativeNetRequestTranslator jsonObjectsFromData:rulesData.get() errorStrings:&jsonDeserializationErrorStrings];

NSArray<NSString *> *parsingErrorStrings;
auto *allConvertedRules = [_WKWebExtensionDeclarativeNetRequestTranslator translateRules:allJSONObjects errorStrings:&parsingErrorStrings];
NSArray<NSString *> *parsingErrorStrings;
auto *allConvertedRules = [_WKWebExtensionDeclarativeNetRequestTranslator translateRules:allJSONObjects errorStrings:&parsingErrorStrings];

auto *webKitRules = encodeJSONString(allConvertedRules, JSONOptions::FragmentsAllowed);
if (!webKitRules) {
completionHandler(false);
return;
}
auto *webKitRules = encodeJSONString(allConvertedRules, JSONOptions::FragmentsAllowed);
if (!webKitRules) {
dispatch_async(dispatch_get_main_queue(), makeBlockPtr([completionHandler = WTFMove(completionHandler)]() mutable {
completionHandler(false);
}).get());
return;
}

auto *previouslyLoadedHash = objectForKey<NSString>(m_state, lastLoadedDeclarativeNetRequestHashStateKey);
auto *hashOfWebKitRules = computeStringHashForContentBlockerRules(webKitRules);
auto *previouslyLoadedHash = objectForKey<NSString>(m_state, lastLoadedDeclarativeNetRequestHashStateKey);
auto *hashOfWebKitRules = computeStringHashForContentBlockerRules(webKitRules);

API::ContentRuleListStore::defaultStore().lookupContentRuleListFile(declarativeNetRequestContentRuleListFilePath(), uniqueIdentifier().isolatedCopy(), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler), previouslyLoadedHash = String { previouslyLoadedHash }, hashOfWebKitRules = String { hashOfWebKitRules }, webKitRules = String { webKitRules }](RefPtr<API::ContentRuleList> foundRuleList, std::error_code) mutable {
if (foundRuleList) {
if ([previouslyLoadedHash isEqualToString:hashOfWebKitRules]) {
for (auto& userContentController : userContentControllers())
userContentController.addContentRuleList(*foundRuleList, m_baseURL);
dispatch_async(dispatch_get_main_queue(), makeBlockPtr([this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler), previouslyLoadedHash = String { previouslyLoadedHash }, hashOfWebKitRules = String { hashOfWebKitRules }, webKitRules = String { webKitRules }]() mutable {
API::ContentRuleListStore::defaultStore().lookupContentRuleListFile(declarativeNetRequestContentRuleListFilePath(), uniqueIdentifier().isolatedCopy(), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler), previouslyLoadedHash, hashOfWebKitRules, webKitRules](RefPtr<API::ContentRuleList> foundRuleList, std::error_code) mutable {
if (foundRuleList) {
if ([previouslyLoadedHash isEqualToString:hashOfWebKitRules]) {
for (auto& userContentController : userContentControllers())
userContentController.addContentRuleList(*foundRuleList, m_baseURL);

completionHandler(true);
return;
}
}
completionHandler(true);
return;
}
}

API::ContentRuleListStore::defaultStore().compileContentRuleListFile(declarativeNetRequestContentRuleListFilePath(), uniqueIdentifier().isolatedCopy(), String(webKitRules), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler), hashOfWebKitRules = String { hashOfWebKitRules }](RefPtr<API::ContentRuleList> ruleList, std::error_code error) mutable {
if (error) {
RELEASE_LOG_ERROR(Extensions, "Error compiling declarativeNetRequest rules: %{public}s", error.message().c_str());
completionHandler(false);
return;
}
API::ContentRuleListStore::defaultStore().compileContentRuleListFile(declarativeNetRequestContentRuleListFilePath(), uniqueIdentifier().isolatedCopy(), String(webKitRules), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler), hashOfWebKitRules](RefPtr<API::ContentRuleList> ruleList, std::error_code error) mutable {
if (error) {
RELEASE_LOG_ERROR(Extensions, "Error compiling declarativeNetRequest rules: %{public}s", error.message().c_str());
completionHandler(false);
return;
}

[m_state setObject:hashOfWebKitRules forKey:lastLoadedDeclarativeNetRequestHashStateKey];
writeStateToStorage();
[m_state setObject:hashOfWebKitRules forKey:lastLoadedDeclarativeNetRequestHashStateKey];
writeStateToStorage();

for (auto& userContentController : userContentControllers())
userContentController.addContentRuleList(*ruleList, m_baseURL);
for (auto& userContentController : userContentControllers())
userContentController.addContentRuleList(*ruleList, m_baseURL);

completionHandler(true);
});
});
completionHandler(true);
});
});
}).get());
}).get());
}

void WebExtensionContext::loadDeclarativeNetRequestRules(CompletionHandler<void(bool)>&& completionHandler)
Expand Down

0 comments on commit cedd7cb

Please sign in to comment.