Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..."

Source/core/frame/LocalFrame.h

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 54 matching lines @@
         void init();
         void setView(PassRefPtr<FrameView>);
         void createView(const IntSize&, const Color&, bool,
             ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
             ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
 
         virtual ~LocalFrame();
 
         virtual void willDetachFrameHost() OVERRIDE;
         virtual void detachFromFrameHost() OVERRIDE;
+        void disconnectOwnerElement();
+
+        HTMLFrameOwnerElement* ownerElement() const;
 
         virtual void setDOMWindow(PassRefPtrWillBeRawPtr<DOMWindow>) OVERRIDE;
         FrameView* view() const;
 
         Editor& editor() const;
         EventHandler& eventHandler() const;
         FrameLoader& loader() const;
         FrameTree& tree() const;
         NavigationScheduler& navigationScheduler() const;
         FrameSelection& selection() const;
@@ skipping 117 matching lines @@
     inline SpellChecker& LocalFrame::spellChecker() const
     {
         return *m_spellChecker;
     }
 
     inline InputMethodController& LocalFrame::inputMethodController() const
     {
         return *m_inputMethodController;
     }
 
+    inline HTMLFrameOwnerElement* LocalFrame::ownerElement() const
+    {
+        return m_ownerElement;
+    }
+
     inline bool LocalFrame::inViewSourceMode() const
     {
         return m_inViewSourceMode;
     }
 
     inline void LocalFrame::setInViewSourceMode(bool mode)
     {
         m_inViewSourceMode = mode;
     }
 
     inline FrameTree& LocalFrame::tree() const
     {
         return m_treeNode;
     }
 
     inline EventHandler& LocalFrame::eventHandler() const
     {
         ASSERT(m_eventHandler);
         return *m_eventHandler;
     }
 
     DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
 
 } // namespace WebCore
 
-// During refactoring, there are some places where we need to do type conversions that
-// will not be needed once all instances of LocalFrame and RemoteFrame are sorted out.
-// At that time this #define will be removed and all the uses of it will need to be corrected.
-#define toLocalFrameTemporary toLocalFrame
-
 #endif // LocalFrame_h