Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp

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 74 matching lines @@
     visitor->trace(m_treeNode);
     visitor->trace(m_host);
     visitor->trace(m_owner);
     visitor->trace(m_client);
 }
 
 void Frame::detach(FrameDetachType type)
 {
     ASSERT(m_client);
     m_client->setOpener(0);
+
+    if (type == FrameDetachType::Swap && isMainFrame() && page())

[dcheng, 2015/11/19 05:09:56]

I don't think page() can ever be null here. An invariant that Frame and its
subclasses try to maintain is that !!page() == !!client() == !!host().

[loyso (OOO), 2015/11/26 06:22:52]

Acknowledged.

+        page()->willSwapMainFrame();
+
     domWindow()->resetLocation();
     disconnectOwnerElement();
     // After this, we must no longer talk to the client since this clears
     // its owning reference back to our owning LocalFrame.
     m_client->detached(type);
     m_client = nullptr;
     m_host = nullptr;
 }
 
 void Frame::detachChildren()
@@ skipping 208 matching lines @@
 
     if (m_owner) {
         if (m_owner->isLocal())
             toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
     } else {
         page()->setMainFrame(this);
     }
 }
 
 } // namespace blink