mozilla-central: changeset 504843:42913f0f886d1cf5e9b23440fd0f0d4556bbce1c

author	Dimi Lee <dlee@mozilla.com>
	Mon, 02 Dec 2019 14:37:25 +0000
changeset 504843	42913f0f886d1cf5e9b23440fd0f0d4556bbce1c
parent 504842	7074213657a3908c2805fa75d8dcebb76bc64ea1
child 504844	d8871ccf76bd3c4c9960954aaa70695883aed31b
push id	36870
push user	nerli@mozilla.com
push date	Mon, 02 Dec 2019 18:41:58 +0000
treeherder	mozilla-central@bc2e8add2746 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	baku
bugs	1599379
milestone	72.0a1
first release with	nightly linux32 9420b5dc27e0 / 73.0a1 / 20191202220401 / files nightly linux64 9420b5dc27e0 / 73.0a1 / 20191202220401 / files nightly mac 9420b5dc27e0 / 73.0a1 / 20191202220401 / files nightly win32 9420b5dc27e0 / 73.0a1 / 20191202220401 / files nightly win64 9420b5dc27e0 / 73.0a1 / 20191202220401 / files
last release without	nightly linux32 b8f3a97900e5 / 72.0a1 / 20191202091209 / files nightly linux64 b8f3a97900e5 / 72.0a1 / 20191202091209 / files nightly mac b8f3a97900e5 / 72.0a1 / 20191202091209 / files nightly win32 b8f3a97900e5 / 72.0a1 / 20191202091209 / files nightly win64 b8f3a97900e5 / 72.0a1 / 20191202091209 / files

Bug 1599379 - Create a DBService instance in GetWorker API when it doesn't exist. r=baku There are two places using DBService during a page load at startup: 1. nsChannelClassifier::Start, used by Phishing Protection 2. AsyncChannelClassifier::CheckChannel, used by Tracking Protection Tracking protection checks happen before establishing a network connection, so it happens prior to phishing protection checkes. When we load a page at startup, ::CheckChannel API is called, but DBService is not yet created. This patch fixes this issue by creating a DBService instance when ::GetWorker API is called without a DBService instance. Differential Revision: https://phabricator.services.mozilla.com/D55248

toolkit/components/url-classifier/nsUrlClassifierDBService.cpp

file | annotate | diff | comparison | revisions

--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -2397,21 +2397,24 @@ nsIThread* nsUrlClassifierDBService::Bac
 
 // static
 bool nsUrlClassifierDBService::ShutdownHasStarted() {
   return gShuttingDownThread;
 }
 
 // static
 nsUrlClassifierDBServiceWorker* nsUrlClassifierDBService::GetWorker() {
-  if (!sUrlClassifierDBService) {
+  nsresult rv;
+  RefPtr<nsUrlClassifierDBService> service =
+      nsUrlClassifierDBService::GetInstance(&rv);
+  if (!service) {
     return nullptr;
   }
 
-  return sUrlClassifierDBService->mWorker;
+  return service->mWorker;
 }
 
 NS_IMETHODIMP
 nsUrlClassifierDBService::AsyncClassifyLocalWithFeatures(
     nsIURI* aURI, const nsTArray<RefPtr<nsIUrlClassifierFeature>>& aFeatures,
     nsIUrlClassifierFeature::listType aListType,
     nsIUrlClassifierFeatureCallback* aCallback) {
   MOZ_ASSERT(NS_IsMainThread());