Chromium Code Reviews| Index: Source/core/frame/LocalDOMWindow.cpp |
| diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp |
| index 0dfa1b05271b5c9587a68c34c68a3249409bfed4..29b116fc61f9a0c629ad98e771a12e1a6e1afa70 100644 |
| --- a/Source/core/frame/LocalDOMWindow.cpp |
| +++ b/Source/core/frame/LocalDOMWindow.cpp |
| @@ -556,22 +556,14 @@ void LocalDOMWindow::willDetachFrameHost() |
| void LocalDOMWindow::willDestroyDocumentInFrame() |
| { |
| - // It is necessary to copy m_properties to a separate vector because the DOMWindowProperties may |
| - // unregister themselves from the LocalDOMWindow as a result of the call to willDestroyGlobalObjectInFrame. |
| - WillBeHeapVector<RawPtrWillBeMember<DOMWindowProperty> > properties; |
|
Mads Ager (chromium)
2014/09/15 07:58:21
Do you still need the copy for the non-oilpan case
sof
2014/09/15 08:10:25
No implementation of willDestroyGlobalObjectInFram
Mads Ager (chromium)
2014/09/15 08:11:40
Sounds good. Thanks for double checking and explai
|
| - copyToVector(m_properties, properties); |
| - for (size_t i = 0; i < properties.size(); ++i) |
| - properties[i]->willDestroyGlobalObjectInFrame(); |
| + for (WillBeHeapHashSet<RawPtrWillBeWeakMember<DOMWindowProperty> >::const_iterator it = m_properties.begin(); it != m_properties.end(); ++it) |
| + (*it)->willDestroyGlobalObjectInFrame(); |
| } |
| void LocalDOMWindow::willDetachDocumentFromFrame() |
| { |
| - // It is necessary to copy m_properties to a separate vector because the DOMWindowProperties may |
| - // unregister themselves from the LocalDOMWindow as a result of the call to willDetachGlobalObjectFromFrame. |
| - WillBeHeapVector<RawPtrWillBeMember<DOMWindowProperty> > properties; |
|
Mads Ager (chromium)
2014/09/15 07:58:21
Ditto.
|
| - copyToVector(m_properties, properties); |
| - for (size_t i = 0; i < properties.size(); ++i) |
| - properties[i]->willDetachGlobalObjectFromFrame(); |
| + for (WillBeHeapHashSet<RawPtrWillBeWeakMember<DOMWindowProperty> >::const_iterator it = m_properties.begin(); it != m_properties.end(); ++it) |
| + (*it)->willDetachGlobalObjectFromFrame(); |
| } |
| void LocalDOMWindow::registerProperty(DOMWindowProperty* property) |