Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/shared_worker/worker_document_set.h" | 5 #include "content/browser/shared_worker/worker_document_set.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 namespace content { | 9 namespace content { |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 // bump the iterator beyond the item being removed before calling erase. | 57 // bump the iterator beyond the item being removed before calling erase. |
| 58 if (i->filter() == parent) { | 58 if (i->filter() == parent) { |
| 59 DocumentInfoSet::iterator item_to_delete = i++; | 59 DocumentInfoSet::iterator item_to_delete = i++; |
| 60 document_set_.erase(item_to_delete); | 60 document_set_.erase(item_to_delete); |
| 61 } else { | 61 } else { |
| 62 ++i; | 62 ++i; |
| 63 } | 63 } |
| 64 } | 64 } |
| 65 } | 65 } |
| 66 | 66 |
| 67 void WorkerDocumentSet::RemoveRenderFrame(int render_process_id, | |
| 68 int render_frame_id) { | |
| 69 for (DocumentInfoSet::iterator i = document_set_.begin(); | |
| 70 i != document_set_.end();) { | |
| 71 if (i->render_process_id() == render_process_id && | |
| 72 i->render_frame_id() == render_frame_id) { | |
| 73 document_set_.erase(i++); | |
|
nhiroki
2016/08/25 09:38:19
"i = document_set_.erase(i)" may work?
horo
2016/08/25 10:55:55
Done.
| |
| 74 } else { | |
| 75 ++i; | |
| 76 } | |
| 77 } | |
| 78 } | |
| 79 | |
| 67 WorkerDocumentSet::DocumentInfo::DocumentInfo( | 80 WorkerDocumentSet::DocumentInfo::DocumentInfo( |
| 68 BrowserMessageFilter* filter, unsigned long long document_id, | 81 BrowserMessageFilter* filter, unsigned long long document_id, |
| 69 int render_process_id, int render_frame_id) | 82 int render_process_id, int render_frame_id) |
| 70 : filter_(filter), | 83 : filter_(filter), |
| 71 document_id_(document_id), | 84 document_id_(document_id), |
| 72 render_process_id_(render_process_id), | 85 render_process_id_(render_process_id), |
| 73 render_frame_id_(render_frame_id) { | 86 render_frame_id_(render_frame_id) { |
| 74 } | 87 } |
| 75 | 88 |
| 76 WorkerDocumentSet::~WorkerDocumentSet() { | 89 WorkerDocumentSet::~WorkerDocumentSet() { |
| 77 } | 90 } |
| 78 | 91 |
| 79 } // namespace content | 92 } // namespace content |
| OLD | NEW |