Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(787)

Unified Diff: content/browser/shared_worker/shared_worker_service_impl.cc

Issue 2249173003: Removes the references to shared workers from the all documents in being deleted frames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: incorporated nhiroki's comment Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/shared_worker/shared_worker_service_impl.cc
diff --git a/content/browser/shared_worker/shared_worker_service_impl.cc b/content/browser/shared_worker/shared_worker_service_impl.cc
index 03b279369e10145bb8b9bf8ecce92152fd5b7b18..78c54826c123da2cd9061b5015fc37b1ec4c4790 100644
--- a/content/browser/shared_worker/shared_worker_service_impl.cc
+++ b/content/browser/shared_worker/shared_worker_service_impl.cc
@@ -157,6 +157,17 @@ class SharedWorkerServiceImpl::SharedWorkerPendingInstance {
requests_.erase(to_remove, requests_.end());
}
+ void RemoveRequestFromFrame(int process_id, int frame_id) {
+ auto to_remove = std::remove_if(
+ requests_.begin(), requests_.end(),
+ [process_id,
+ frame_id](const std::unique_ptr<SharedWorkerPendingRequest>& r) {
+ return r->render_process_id == process_id &&
+ r->render_frame_route_id == frame_id;
+ });
+ requests_.erase(to_remove, requests_.end());
+ }
+
void RegisterToSharedWorkerHost(SharedWorkerHost* host) {
for (const auto& request : requests_) {
host->AddFilter(request->filter, request->route_id);
@@ -439,6 +450,23 @@ void SharedWorkerServiceImpl::OnSharedWorkerMessageFilterClosing(
pending_instances_.erase(to_remove);
}
+void SharedWorkerServiceImpl::RenderFrameDetached(int render_process_id,
+ int render_frame_id) {
+ ScopedWorkerDependencyChecker checker(this);
+ for (const auto& it : worker_hosts_) {
+ it.second->RenderFrameDetached(render_process_id, render_frame_id);
+ }
+
+ auto it = pending_instances_.begin();
+ while (it != pending_instances_.end()) {
+ it->second->RemoveRequestFromFrame(render_process_id, render_frame_id);
+ if (it->second->requests()->empty())
+ it = pending_instances_.erase(it);
+ else
+ ++it;
+ }
+}
+
void SharedWorkerServiceImpl::NotifyWorkerDestroyed(int worker_process_id,
int worker_route_id) {
FOR_EACH_OBSERVER(WorkerServiceObserver,
« no previous file with comments | « content/browser/shared_worker/shared_worker_service_impl.h ('k') | content/browser/shared_worker/worker_document_set.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698