Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..."

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 62 matching lines @@
     : m_host(host)
     , m_ownerElement(ownerElement)
     , m_frameID(generateFrameID())
     , m_remotePlatformLayer(0)
 {
     ASSERT(page());
 
 #ifndef NDEBUG
     frameCounter.increment();
 #endif
-
-    if (this->ownerElement()) {
-        page()->incrementSubframeCount();
-        this->ownerElement()->setContentFrame(*this);
-    }
 }
 
 Frame::~Frame()
 {
-    disconnectOwnerElement();
     setDOMWindow(nullptr);
 
     // FIXME: We should not be doing all this work inside the destructor
 
 #ifndef NDEBUG
     frameCounter.decrement();
 #endif
 
     HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.end();
     for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
@@ skipping 93 matching lines @@
 {
     m_host = 0;
 }
 
 bool Frame::isMainFrame() const
 {
     Page* page = this->page();
     return page && this == page->mainFrame();
 }
 
-void Frame::disconnectOwnerElement()
-{
-    // FIXME: The semantics here are specific to LocalFrame and will need to change
-    // when RemoteFrames no longer have Documents.
-    if (ownerElement()) {
-        if (Document* doc = document())
-            doc->topDocument().clearAXObjectCache();
-        ownerElement()->clearContentFrame();
-        if (page())
-            page()->decrementSubframeCount();
-    }
-    m_ownerElement = 0;
-}
-
 } // namespace WebCore