Commit 84e2037b authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

[jumbo] Unduplicate duplicated IsShuttingDown

Quick fix to unbreak jumbo builds. In
https://chromium-review.googlesource.com/c/chromium/src/+/1205976
a copy of IsShuttingDown was added and this patch changes the code
to instead use the original version.

TBR=kinuko@chromium.org,nhiroki@chromium.org

Bug: 715632
Change-Id: I2451fcaa009ec6403827cdb05cd3b47112c4681b
Reviewed-on: https://chromium-review.googlesource.com/1209703Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#589148}
parent 0471a31c
...@@ -61,11 +61,6 @@ bool AllowIndexedDBOnIOThread(const GURL& url, ...@@ -61,11 +61,6 @@ bool AllowIndexedDBOnIOThread(const GURL& url,
url, name, resource_context, render_frames); url, name, resource_context, render_frames);
} }
bool IsShuttingDown(RenderProcessHost* host) {
return !host || host->FastShutdownStarted() ||
host->IsKeepAliveRefCountDisabled();
}
} // namespace } // namespace
// RAII helper class for talking to SharedWorkerDevToolsManager. // RAII helper class for talking to SharedWorkerDevToolsManager.
......
...@@ -56,11 +56,6 @@ using StartLoaderCallback = ...@@ -56,11 +56,6 @@ using StartLoaderCallback =
blink::mojom::SharedWorkerMainScriptLoadParamsPtr, blink::mojom::SharedWorkerMainScriptLoadParamsPtr,
base::Optional<SubresourceLoaderParams>)>; base::Optional<SubresourceLoaderParams>)>;
bool IsShuttingDown(RenderProcessHost* host) {
return !host || host->FastShutdownStarted() ||
host->IsKeepAliveRefCountDisabled();
}
std::unique_ptr<URLLoaderFactoryBundleInfo> CreateFactoryBundle( std::unique_ptr<URLLoaderFactoryBundleInfo> CreateFactoryBundle(
int process_id, int process_id,
StoragePartitionImpl* storage_partition, StoragePartitionImpl* storage_partition,
...@@ -221,6 +216,11 @@ void CreateScriptLoaderOnIO( ...@@ -221,6 +216,11 @@ void CreateScriptLoaderOnIO(
} // namespace } // namespace
bool IsShuttingDown(RenderProcessHost* host) {
return !host || host->FastShutdownStarted() ||
host->IsKeepAliveRefCountDisabled();
}
SharedWorkerServiceImpl::SharedWorkerServiceImpl( SharedWorkerServiceImpl::SharedWorkerServiceImpl(
StoragePartitionImpl* storage_partition, StoragePartitionImpl* storage_partition,
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context, scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
......
...@@ -36,6 +36,9 @@ class SharedWorkerHost; ...@@ -36,6 +36,9 @@ class SharedWorkerHost;
class StoragePartitionImpl; class StoragePartitionImpl;
struct SubresourceLoaderParams; struct SubresourceLoaderParams;
// Shared helper function
bool IsShuttingDown(RenderProcessHost* host);
// Created per StoragePartition. // Created per StoragePartition.
class CONTENT_EXPORT SharedWorkerServiceImpl : public SharedWorkerService { class CONTENT_EXPORT SharedWorkerServiceImpl : public SharedWorkerService {
public: public:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment