macOS: Fix compile errors (issue #2419)

This commit is contained in:
Marshall Greenblatt
2018-04-04 16:08:37 -04:00
parent 1e6d036cfe
commit 30bfedfb19
3 changed files with 29 additions and 0 deletions

View File

@@ -64,6 +64,8 @@ class MacHelper : public content::BrowserCompositorMacClient,
view_->render_widget_host()->DidReceiveFirstFrameAfterNavigation();
}
void DestroyCompositorForShutdown() override {}
private:
// Guaranteed to outlive this object.
CefRenderWidgetHostViewOSR* view_;

View File

@@ -363,4 +363,9 @@ patches = [
# https://bugs.chromium.org/p/chromium/issues/detail?id=817738
'name': 'win_strcat_817738',
},
{
# Fix jumbo build compile error in service_worker_version.cc
# https://crrev.com/35dabc0d
'name': 'service_worker_jumbo',
},
]

View File

@@ -0,0 +1,22 @@
diff --git content/browser/service_worker/service_worker_version.cc content/browser/service_worker/service_worker_version.cc
index 2417abcfdae2..c66986773923 100644
--- content/browser/service_worker/service_worker_version.cc
+++ content/browser/service_worker/service_worker_version.cc
@@ -54,8 +54,6 @@
namespace content {
-using StatusCallback = ServiceWorkerVersion::StatusCallback;
-
namespace {
// Timeout for an installed worker to start.
@@ -103,7 +101,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) {