Index: content/browser/worker_host/shared_worker_document_set.cc |
diff --git a/content/browser/worker_host/worker_document_set.cc b/content/browser/worker_host/shared_worker_document_set.cc |
similarity index 54% |
copy from content/browser/worker_host/worker_document_set.cc |
copy to content/browser/worker_host/shared_worker_document_set.cc |
index 1bd193b592d1135cb4a67f7a49c6412b33420034..ebc2ca3353c74a522c33d879df96c6f729724845 100644 |
--- a/content/browser/worker_host/worker_document_set.cc |
+++ b/content/browser/worker_host/shared_worker_document_set.cc |
@@ -1,26 +1,26 @@ |
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/browser/worker_host/worker_document_set.h" |
+#include "content/browser/worker_host/shared_worker_document_set.h" |
#include "base/logging.h" |
namespace content { |
-WorkerDocumentSet::WorkerDocumentSet() { |
+SharedWorkerDocumentSet::SharedWorkerDocumentSet() { |
} |
-void WorkerDocumentSet::Add(WorkerMessageFilter* parent, |
- unsigned long long document_id, |
- int render_process_id, |
- int render_frame_id) { |
+void SharedWorkerDocumentSet::Add(SharedWorkerMessageFilter* parent, |
+ unsigned long long document_id, |
+ int render_process_id, |
+ int render_frame_id) { |
DocumentInfo info(parent, document_id, render_process_id, render_frame_id); |
document_set_.insert(info); |
} |
-bool WorkerDocumentSet::Contains(WorkerMessageFilter* parent, |
- unsigned long long document_id) const { |
+bool SharedWorkerDocumentSet::Contains(SharedWorkerMessageFilter* parent, |
+ unsigned long long document_id) const { |
for (DocumentInfoSet::const_iterator i = document_set_.begin(); |
i != document_set_.end(); ++i) { |
if (i->filter() == parent && i->document_id() == document_id) |
@@ -29,8 +29,18 @@ bool WorkerDocumentSet::Contains(WorkerMessageFilter* parent, |
return false; |
} |
-void WorkerDocumentSet::Remove(WorkerMessageFilter* parent, |
- unsigned long long document_id) { |
+bool SharedWorkerDocumentSet::ContainsExternalRenderer( |
+ int worker_process_id) const { |
+ for (DocumentInfoSet::const_iterator i = document_set_.begin(); |
+ i != document_set_.end(); ++i) { |
+ if (i->render_process_id() != worker_process_id) |
+ return true; |
+ } |
+ return false; |
+} |
+ |
+void SharedWorkerDocumentSet::Remove(SharedWorkerMessageFilter* parent, |
+ unsigned long long document_id) { |
for (DocumentInfoSet::iterator i = document_set_.begin(); |
i != document_set_.end(); i++) { |
if (i->filter() == parent && i->document_id() == document_id) { |
@@ -42,7 +52,7 @@ void WorkerDocumentSet::Remove(WorkerMessageFilter* parent, |
DCHECK(!Contains(parent, document_id)); |
} |
-void WorkerDocumentSet::RemoveAll(WorkerMessageFilter* parent) { |
+void SharedWorkerDocumentSet::RemoveAll(SharedWorkerMessageFilter* parent) { |
for (DocumentInfoSet::iterator i = document_set_.begin(); |
i != document_set_.end();) { |
@@ -58,8 +68,8 @@ void WorkerDocumentSet::RemoveAll(WorkerMessageFilter* parent) { |
} |
} |
-WorkerDocumentSet::DocumentInfo::DocumentInfo( |
- WorkerMessageFilter* filter, unsigned long long document_id, |
+SharedWorkerDocumentSet::DocumentInfo::DocumentInfo( |
+ SharedWorkerMessageFilter* filter, unsigned long long document_id, |
int render_process_id, int render_frame_id) |
: filter_(filter), |
document_id_(document_id), |
@@ -67,7 +77,7 @@ WorkerDocumentSet::DocumentInfo::DocumentInfo( |
render_frame_id_(render_frame_id) { |
} |
-WorkerDocumentSet::~WorkerDocumentSet() { |
+SharedWorkerDocumentSet::~SharedWorkerDocumentSet() { |
} |
} // namespace content |