Gracefully handle a self-referential opener in frame swap.

third_party/WebKit/Source/web/OpenedFrameTracker.cpp

 // 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 "config.h"
 #include "web/OpenedFrameTracker.h"
 
 #include "platform/heap/Handle.h"
 #include "public/web/WebFrame.h"
 
 namespace blink {
 
 OpenedFrameTracker::OpenedFrameTracker()
 {
 }
 
 OpenedFrameTracker::~OpenedFrameTracker()
 {
 #if !ENABLE(OILPAN)
     // Oilpan takes care of clearing weak m_opener fields during GC.
-    updateOpener(0);
+    transferTo(nullptr);
 #endif
 }
 
 bool OpenedFrameTracker::isEmpty() const
 {
     return m_openedFrames.isEmpty();
 }
 
 void OpenedFrameTracker::add(WebFrame* frame)
 {
     m_openedFrames.add(frame);
 }
 
 void OpenedFrameTracker::remove(WebFrame* frame)
 {
     m_openedFrames.remove(frame);
 }
 
-void OpenedFrameTracker::updateOpener(WebFrame* frame)
+void OpenedFrameTracker::transferTo(WebFrame* opener)
 {
-    HashSet<WebFrame*>::iterator end = m_openedFrames.end();
-    for (HashSet<WebFrame*>::iterator it = m_openedFrames.begin(); it != end; ++it)
-        (*it)->m_opener = frame;
+    HashSet<WebFrame*> frames(m_openedFrames);

[alexmos, 2015/10/27 19:09:51]

nit: is it worth adding a comment about why the copy is necessary here? (because
setOpener modifies m_openedFrames, right?)

[dcheng, 2015/10/27 19:11:16]

Yeah, probably worth commenting. I'll add it and CQ it after lunch.

+    for (WebFrame* frame : frames)
+        frame->setOpener(opener);
 }
 
 template <typename VisitorDispatcher>
 ALWAYS_INLINE void OpenedFrameTracker::traceFramesImpl(VisitorDispatcher visitor)
 {
 #if ENABLE(OILPAN)
     HashSet<WebFrame*>::iterator end = m_openedFrames.end();
     for (HashSet<WebFrame*>::iterator it = m_openedFrames.begin(); it != end; ++it)
         WebFrame::traceFrame(visitor, *it);
 #endif
 }
 
 void OpenedFrameTracker::traceFrames(Visitor* visitor) { traceFramesImpl(visitor); }
 void OpenedFrameTracker::traceFrames(InlinedGlobalMarkingVisitor visitor) { traceFramesImpl(visitor); }
 
 } // namespace blink