Backport "ServiceWorker: Fix a jumbo build error"
https://chromium-review.googlesource.com/957568
This commit is contained in:
Родитель
a698aa9acf
Коммит
303fe7b7c9
|
@ -253,3 +253,10 @@ patches:
|
|||
description: |
|
||||
Backports part of 4dabe8070550cb4014d1f996aa1a7e130bef42e1 so that we don't
|
||||
need the native_client source tree.
|
||||
-
|
||||
owners: MarshallOfSound
|
||||
file: backport_35dabc0.patch
|
||||
description: |
|
||||
Backports "ServiceWorker: Fix a jumbo build error",
|
||||
see https://chromium-review.googlesource.com/957568
|
||||
Original change's landed in 67.0.3369.0.
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
|
||||
index 2417abcfdae2..13a06d02e012 100644
|
||||
--- a/content/browser/service_worker/service_worker_version.cc
|
||||
+++ b/content/browser/service_worker/service_worker_version.cc
|
||||
@@ -53,9 +53,6 @@
|
||||
#include "third_party/WebKit/public/web/WebConsoleMessage.h"
|
||||
|
||||
namespace content {
|
||||
-
|
||||
-using StatusCallback = ServiceWorkerVersion::StatusCallback;
|
||||
-
|
||||
namespace {
|
||||
|
||||
// Timeout for an installed worker to start.
|
||||
@@ -103,7 +100,7 @@ void RunCallbacks(ServiceWorkerVersion* version,
|
||||
|
||||
// An adapter to run a |callback| after StartWorker.
|
||||
void RunCallbackAfterStartWorker(base::WeakPtr<ServiceWorkerVersion> version,
|
||||
- StatusCallback callback,
|
||||
+ ServiceWorkerVersion::StatusCallback callback,
|
||||
ServiceWorkerStatusCode status) {
|
||||
if (status == SERVICE_WORKER_OK &&
|
||||
version->running_status() != EmbeddedWorkerStatus::RUNNING) {
|
Загрузка…
Ссылка в новой задаче