RemoteBridgeFrameOwner: keep better track of the attached frame

third_party/WebKit/Source/core/frame/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 96 matching lines @@
     childrenToDetach.reserveCapacity(tree().childCount());
     for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling())
         childrenToDetach.append(child);
     for (const auto& child : childrenToDetach)
         child->detach(FrameDetachType::Remove);
 }
 
 void Frame::disconnectOwnerElement()
 {
     if (m_owner) {
-        if (m_owner->isLocal())
-            toHTMLFrameOwnerElement(m_owner)->clearContentFrame();
+        m_owner->clearContentFrame();
+        m_owner = nullptr;

[haraken, 2016/03/16 14:17:41]

Is there any assert to check that m_owner's content frame is in sync with the
actual content frame?

[dcheng, 2016/03/16 16:51:41]

Done. I did it in the two "real" FrameOwner implementations though: otherwise, I
have to add a new virtual to FrameOwner for ASSERT-only purposes.

     }
-    m_owner = nullptr;
 }
 
 Page* Frame::page() const
 {
     if (m_host)
         return &m_host->page();
     return nullptr;
 }
 
 FrameHost* Frame::host() const
@@ skipping 171 matching lines @@
     , m_isLoading(false)
 {
     InstanceCounters::incrementCounter(InstanceCounters::FrameCounter);
 
     ASSERT(page());
 
 #ifndef NDEBUG
     frameCounter().increment();
 #endif
 
-    if (m_owner) {
-        if (m_owner->isLocal())
-            toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
-    } else {
+    if (m_owner)
+        m_owner->setContentFrame(*this);
+    else
         page()->setMainFrame(this);
-    }
 }
 
 } // namespace blink